diff --git a/common/zarf.yaml b/common/zarf.yaml
index 7c28d072..4a81beea 100644
--- a/common/zarf.yaml
+++ b/common/zarf.yaml
@@ -28,6 +28,9 @@ components:
         localPath: ../charts/settings
     actions:
       onDeploy:
+        before:
+          - cmd: ./zarf tools kubectl label secret -n gitlab gitlab-object-store app.kubernetes.io/managed-by=Helm || true
+          - cmd: ./zarf tools kubectl annotate secret -n gitlab gitlab-object-store meta.helm.sh/release-name=uds-gitlab-config || true
         after:
           - description: Validate GitLab Package
             maxTotalSeconds: 300
diff --git a/src/dev-secrets/minio-secret.yaml b/src/dev-secrets/minio-secret.yaml
deleted file mode 100644
index 82a910f8..00000000
--- a/src/dev-secrets/minio-secret.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2024 Defense Unicorns
-# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial
-
-# Source: bigbang/templates/gitlab/secret-objectstore.yaml
-apiVersion: v1
-kind: Secret
-metadata:
-  name: gitlab-object-store
-  namespace: gitlab
-type: kubernetes.io/opaque
-stringData:
-  connection: |-
-    provider: AWS
-    region: minio
-    aws_access_key_id: ###ZARF_VAR_ACCESS_KEY###
-    aws_secret_access_key: ###ZARF_VAR_SECRET_KEY###
-    endpoint: "http://minio.dev-minio.svc.cluster.local:9000"
-    aws_signature_version: 4
-    path_style: true
-  registry: |-
-    s3:
-      bucket: uds-gitlab-registry
-      accesskey: ###ZARF_VAR_ACCESS_KEY###
-      secretkey: ###ZARF_VAR_SECRET_KEY###
-      regionendpoint: "http://minio.dev-minio.svc.cluster.local:9000"
-      region: minio
-      aws_signature_version: 4
-      path_style: true
-  backups: |-
-    [default]
-    access_key = ###ZARF_VAR_ACCESS_KEY###
-    secret_key = ###ZARF_VAR_SECRET_KEY###
-    host_base = http://minio.dev-minio.svc.cluster.local:9000
-    host_bucket = http://minio.dev-minio.svc.cluster.local:9000
-    bucket_location = minio
-    multipart_chunk_size_mb = 128
-    use_https = False
diff --git a/src/dev-secrets/zarf.yaml b/src/dev-secrets/zarf.yaml
deleted file mode 100644
index c373c76f..00000000
--- a/src/dev-secrets/zarf.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2024 Defense Unicorns
-# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial
-
-# yaml-language-server: $schema=https://raw.githubusercontent.com/defenseunicorns/zarf/main/zarf.schema.json
-kind: ZarfPackageConfig
-metadata:
-  name: dev-secrets
-  version: "0.1.0"
-
-
-components:
-  - name: minio-password
-    required: true
-    actions:
-      onDeploy:
-        before:
-          - cmd: ./zarf tools kubectl get secret -n dev-minio minio --template='{{ index .data "rootPassword" }}' | base64 -d
-            mute: true
-            setVariables:
-              - name: SECRET_KEY
-                sensitive: true
-          - cmd: kubectl get secret -n dev-minio minio --template='{{ index .data "rootUser" }}' | base64 -d
-            mute: true
-            setVariables:
-              - name: ACCESS_KEY
-                sensitive: true
-  - name: gitlab-minio
-    required: true
-    manifests:
-      - name: gitlab-minio
-        files:
-          - "minio-secret.yaml"
diff --git a/src/namespace/gitlab-ns.yaml b/src/namespace/gitlab-ns.yaml
deleted file mode 100644
index 393245f9..00000000
--- a/src/namespace/gitlab-ns.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 2024 Defense Unicorns
-# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial
-
-kind: Namespace
-apiVersion: v1
-metadata:
-  name: gitlab
diff --git a/src/namespace/zarf.yaml b/src/namespace/zarf.yaml
deleted file mode 100644
index 1a24af99..00000000
--- a/src/namespace/zarf.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2024 Defense Unicorns
-# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial
-
-kind: ZarfPackageConfig
-metadata:
-  name: dev-namespace
-  description: "create namespaces for cross-ns secret functionality of pg operator"
-  version: 0.1.0
-
-components:
-  - name: deploy-namespace-for-cross-ns-secret
-    required: true
-    manifests:
-      - name: dev-namespace
-        files:
-          - gitlab-ns.yaml
diff --git a/tasks.yaml b/tasks.yaml
index 36a60f51..a04430a0 100644
--- a/tasks.yaml
+++ b/tasks.yaml
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial
 
 includes:
+  # TODO Delete dependencies.yaml after next releaser
   - dependencies: ./tasks/dependencies.yaml
   - test: ./tasks/test.yaml
   - create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.2.2/tasks/create.yaml
@@ -33,7 +34,6 @@ tasks:
   - name: create-deploy-test-bundle
     description: Test and validate cluster is deployed with GitLab
     actions:
-      - task: dependencies:create
       - task: create:test-bundle
       - task: deploy:test-bundle
       - task: setup:create-doug-user
@@ -59,6 +59,7 @@ tasks:
   - name: test-upgrade
     description: Test an upgrade from the latest released package to the current branch
     actions:
+      # TODO Delete dependencies.yaml after next releaser
       - task: upgrade:create-latest-tag-bundle
         with:
           dep_commands: ./uds run dependencies:create