diff --git a/archivematica/prod_cluster/archivematica_deployment.tf b/archivematica/prod_cluster/archivematica_deployment.tf
index 625778d..d65b2c0 100644
--- a/archivematica/prod_cluster/archivematica_deployment.tf
+++ b/archivematica/prod_cluster/archivematica_deployment.tf
@@ -53,7 +53,7 @@ resource "kubernetes_deployment" "archivematica_prod" {
           }
           env {
             name  = "DJANGO_SETTINGS_MODULE"
-            value = "storage_service.settings.production"
+            value = "archivematica.storage_service.storage_service.settings.production"
           }
           env {
             name  = "FORWARDED_ALLOW_IPS"
@@ -177,7 +177,7 @@ resource "kubernetes_deployment" "archivematica_prod" {
           }
           env {
             name  = "AM_GUNICORN_CHDIR"
-            value = "/src/src/archivematicaCommon/lib/"
+            value = "/src/src/archivematica/archivematicaCommon"
           }
           env {
             name  = "ARCHIVEMATICA_DASHBOARD_EMAIL_PORT"
@@ -268,7 +268,7 @@ resource "kubernetes_deployment" "archivematica_prod" {
           }
           env {
             name  = "DJANGO_SETTINGS_MODULE"
-            value = "settings.common"
+            value = "archivematica.MCPServer.settings.common"
           }
           env {
             name  = "ARCHIVEMATICA_MCPSERVER_CLIENT_USER"
@@ -341,10 +341,10 @@ resource "kubernetes_deployment" "archivematica_prod" {
           image   = local.desired_images["archivematica-storage-service-prod"]
           name    = "archivematica-storage-service-migrations"
           command = ["sh"]
-          args    = ["-c", "python manage.py migrate --noinput"]
+          args    = ["-c", "python -m archivematica.storage_service.manage migrate --noinput"]
           env {
             name  = "DJANGO_SETTINGS_MODULE"
-            value = "storage_service.settings.local"
+            value = "archivematica.storage_service.storage_service.settings.local"
           }
           env {
             name  = "FORWARDED_ALLOW_IPS"
@@ -382,7 +382,7 @@ resource "kubernetes_deployment" "archivematica_prod" {
           name  = "archivematica-storage-service-create-user"
           env {
             name  = "DJANGO_SETTINGS_MODULE"
-            value = "storage_service.settings.local"
+            value = "archivematica.storage_service.storage_service.settings.local"
           }
           env {
             name  = "FORWARDED_ALLOW_IPS"
@@ -443,13 +443,13 @@ resource "kubernetes_deployment" "archivematica_prod" {
             }
           }
           command = ["sh"]
-          args    = ["-c", "python manage.py create_user --username=$(AM_SS_USERNAME) --password='$(AM_SS_PASSWORD)' --email=$(AM_SS_EMAIL) --api-key=$(AM_SS_API_KEY) --superuser"]
+          args    = ["-c", "python -m archivematica.storage_service.manage create_user --username=$(AM_SS_USERNAME) --password='$(AM_SS_PASSWORD)' --email=$(AM_SS_EMAIL) --api-key=$(AM_SS_API_KEY) --superuser"]
         }
         init_container {
           image   = local.desired_images["archivematica-dashboard-prod"]
           name    = "archivematica-dashboard-migration"
           command = ["sh"]
-          args    = ["-c", "python /src/src/dashboard/src/manage.py migrate --noinput"]
+          args    = ["-c", "python /src/src/archivematica/dashboard/manage.py migrate --noinput"]
           env {
             name  = "DJANGO_SETTINGS_MODULE"
             value = "settings.local"
@@ -627,7 +627,7 @@ resource "kubernetes_deployment" "mcp_client_prod" {
           }
           env {
             name  = "DJANGO_SETTINGS_MODULE"
-            value = "settings.common"
+            value = "archivematica.MCPClient.settings.common"
           }
           env {
             name  = "ARCHIVEMATICA_MCPCLIENT_EMAIL_BACKEND"
diff --git a/archivematica/test_cluster/2 b/archivematica/test_cluster/2
deleted file mode 100644
index 6de19a2..0000000
--- a/archivematica/test_cluster/2
+++ /dev/null
@@ -1,814 +0,0 @@
-data "kubernetes_resource" "archivematica_dev" {
-  count = 1
-  kind        = "Deployment"
-  api_version = "apps/v1"
-  metadata { name = "archivematica-dev" }
-}
-
-resource "kubernetes_deployment" "archivematica_dev" {
-  metadata {
-    name = "archivematica-dev"
-    labels = {
-      App         = "archivematica-dev"
-      Environment = "dev"
-    }
-  }
-  spec {
-    replicas = 1
-    selector {
-      match_labels = {
-        App = "archivematica-dev"
-      }
-    }
-    template {
-      metadata {
-        labels = {
-          App = "archivematica-dev"
-        }
-      }
-      spec {
-        security_context {
-          fs_group               = 1000
-          fs_group_change_policy = "OnRootMismatch"
-        }
-        container {
-          image = local.desired_images["archivematica-storage-service-dev"]
-          name  = "archivematica-storage-service-dev"
-          env {
-            name  = "SS_GUNICORN_BIND"
-            value = "0.0.0.0:8002"
-          }
-          env {
-            name  = "DJANGO_SETTINGS_MODULE"
-            value = "storage_service.settings.production"
-          }
-          env {
-            name  = "FORWARDED_ALLOW_IPS"
-            value = "*"
-          }
-          env {
-            name  = "SS_GNUPG_HOME_PATH"
-            value = "/var/archivematica/storage_service/.gnupg"
-          }
-          env {
-            name  = "SS_GUNICORN_ACCESSLOG"
-            value = "/dev/null"
-          }
-          env {
-            name  = "SS_GUNICORN_RELOAD"
-            value = "true"
-          }
-          env {
-            name  = "SS_GUNICORN_RELOAD_ENGINE"
-            value = "auto"
-          }
-          env {
-            name = "SS_DB_URL"
-            value_from {
-              secret_key_ref {
-                name     = "dev-archivematica-secrets"
-                key      = "SS_DB_URL"
-                optional = false
-              }
-            }
-          }
-          env {
-            name  = "SS_GUNICORN_LOGLEVEL"
-            value = "debug"
-          }
-          env {
-            name  = "SS_GUNICORN_WORKERS"
-            value = "3"
-          }
-          env {
-            name  = "RCLONE_CONFIG"
-            value = "/var/archivematica/storage_service/.rclone.conf"
-          }
-          env {
-            name  = "DJANGO_ALLOWED_HOSTS"
-            value = "dev.archivematica.permanent.org"
-          }
-          env {
-            name  = "DJANGO_SECRET_KEY"
-            value_from {
-              secret_key_ref {
-                name     = "dev-archivematica-secrets"
-                key      = "DJANGO_SECRET_KEY"
-                optional = false
-              }
-            }
-          }
-          port {
-            container_port = 8002
-          }
-          volume_mount {
-            mount_path = "/var/archivematica/sharedDirectory"
-            name       = "dev-pipeline-data"
-          }
-          volume_mount {
-            mount_path = "/var/archivematica/storage_service"
-            name       = "dev-staging-data"
-          }
-          volume_mount {
-            mount_path = "/home"
-            name       = "dev-location-data"
-            sub_path   = "sips"
-          }
-          volume_mount {
-            mount_path = "/home/transfer"
-            name       = "dev-transfer-share"
-          }
-          volume_mount {
-            mount_path = "/data/storage"
-            name       = "dev-storage-share"
-          }
-        }
-        container {
-          image = local.desired_images["archivematica-dashboard-dev"]
-          name  = "archivematica-dashboard-dev"
-          env {
-            name  = "AM_GUNICORN_BIND"
-            value = "0.0.0.0:8001"
-          }
-          env {
-            name  = "DJANGO_SETTINGS_MODULES"
-            value = "settings.production"
-          }
-          env {
-            name  = "FORWARDED_ALLOW_IPS"
-            value = "*"
-          }
-          env {
-            name  = "AM_GUNICORN_ACCESSLOG"
-            value = "/dev/null"
-          }
-          env {
-            name  = "AM_GUNICORN_RELOAD"
-            value = "true"
-          }
-          env {
-            name  = "AM_GUNICORN_RELOAD_ENGINE"
-            value = "auto"
-          }
-          env {
-            name  = "AM_GUNICORN_LOGLEVEL"
-            value = "debug"
-          }
-          env {
-            name  = "AM_GUNICORN_WORKERS"
-            value = "1"
-          }
-          env {
-            name  = "AM_GUNICORN_PROC_NAME"
-            value = "archivematica-dashboard"
-          }
-          env {
-            name  = "AM_GUNICORN_CHDIR"
-            value = "/src/src/archivematicaCommon/lib/"
-          }
-          env {
-            name  = "ARCHIVEMATICA_DASHBOARD_EMAIL_PORT"
-            value = "587"
-          }
-          env {
-            name  = "ARCHIVEMATICA_DASHBOARD_CLIENT_PORT"
-            value = "3306"
-          }
-          env {
-            name  = "ARCHIVEMATICA_DASHBOARD_CLIENT_DATABASE"
-            value = "MCP"
-          }
-          env {
-            name = "ARCHIVEMATICA_DASHBOARD_CLIENT_HOST"
-            value_from {
-              secret_key_ref {
-                name     = "dev-archivematica-secrets"
-                key      = "ARCHIVEMATICA_DASHBOARD_CLIENT_HOST"
-                optional = false
-              }
-            }
-          }
-          env {
-            name  = "ARCHIVEMATICA_DASHBOARD_CLIENT_USER"
-            value = "archivematica"
-          }
-          env {
-            name = "ARCHIVEMATICA_DASHBOARD_CLIENT_PASSWORD"
-            value_from {
-              secret_key_ref {
-                name     = "dev-archivematica-secrets"
-                key      = "ARCHIVEMATICA_DASHBOARD_CLIENT_PASSWORD"
-                optional = false
-              }
-            }
-          }
-          env {
-            name  = "ARCHIVEMATICA_DASHBOARD_DASHBOARD_GEARMAN_SERVER"
-            value = "archivematica-gearman-dev:4730"
-          }
-          env {
-            name  = "ARCHIVEMATICA_DASHBOARD_DASHBOARD_DJANGO_ALLOWED_HOSTS"
-            value = "dev.archivematica.permanent.org"
-          }
-          env {
-            name  = "ARCHIVEMATICA_DASHBOARD_DASHBOARD_SEARCH_ENABLED"
-            value = "false"
-          }
-          env {
-            name  = "ARCHIVEMATICA_DASHBOARD_DASHBOARD_STORAGE_SERVICE_CLIENT_QUICK_TIMEOUT"
-            value = "20"
-          }
-          env {
-            name = "ARCHIVEMATICA_DASHBOARD_DASHBOARD_DJANGO_SECRET_KEY"
-            value_from {
-              secret_key_ref {
-                name     = "dev-archivematica-secrets"
-                key      = "DJANGO_SECRET_KEY"
-                optional = false
-              }
-            }
-          }
-          port {
-            container_port = 8001
-          }
-          volume_mount {
-            mount_path = "/var/archivematica/sharedDirectory"
-            name       = "dev-pipeline-data"
-          }
-          volume_mount {
-            mount_path = "/home/transfer"
-            name       = "dev-transfer-share"
-          }
-        }
-        container {
-          image = local.desired_images["archivematica-mcp-server-dev"]
-          name  = "archivematica-mcp-server-dev"
-          env {
-            name  = "DJANGO_SECRET_KEY"
-            value_from {
-              secret_key_ref {
-                name     = "dev-archivematica-secrets"
-                key      = "DJANGO_SECRET_KEY"
-                optional = false
-              }
-            }
-          }
-          env {
-            name  = "DJANGO_SETTINGS_MODULE"
-            value = "settings.common"
-          }
-          env {
-            name  = "ARCHIVEMATICA_MCPSERVER_CLIENT_USER"
-            value = "archivematica"
-          }
-          env {
-            name = "ARCHIVEMATICA_MCPSERVER_CLIENT_PASSWORD"
-            value_from {
-              secret_key_ref {
-                name     = "dev-archivematica-secrets"
-                key      = "ARCHIVEMATICA_DASHBOARD_CLIENT_PASSWORD"
-                optional = false
-              }
-            }
-          }
-          env {
-            name = "ARCHIVEMATICA_MCPSERVER_CLIENT_HOST"
-            value_from {
-              secret_key_ref {
-                name     = "dev-archivematica-secrets"
-                key      = "ARCHIVEMATICA_DASHBOARD_CLIENT_HOST"
-                optional = false
-              }
-            }
-          }
-          env {
-            name  = "ARCHIVEMATICA_MCPSERVER_CLIENT_DATABASE"
-            value = "MCP"
-          }
-          env {
-            name  = "ARCHIVEMATICA_MCPSERVER_MCPSERVER_MCPARCHIVEMATICASERVER"
-            value = "archivematica-gearman-dev:4730"
-          }
-          env {
-            name  = "ARCHIVEMATICA_MCPSERVER_SEARCH_ENABLED"
-            value = "false"
-          }
-          env {
-            name  = "ARCHIVEMATICA_MCPSERVER_MCPSERVER_RPC_THREADS"
-            value = "8"
-          }
-          env {
-            name  = "ARCHIVEMATICA_MCPSERVER_MCPSERVER_WORKER_THREADS"
-            value = "1"
-          }
-          env {
-            name  = "ARCHIVEMATICA_MCPSERVER_MCPSERVER_CONCURRENT_PACKAGES"
-            value = "100"
-          }
-          resources {
-            requests = {
-              memory = "256Mi"
-              cpu    = "1m"
-            }
-            limits = {
-              memory = "2048Mi"
-              cpu    = "333m"
-            }
-          }
-          volume_mount {
-            mount_path = "/var/archivematica/sharedDirectory"
-            name       = "dev-pipeline-data"
-          }
-          volume_mount {
-            mount_path = "/home/transfer"
-            name       = "dev-transfer-share"
-          }
-        }
-        init_container {
-          image   = local.desired_images["archivematica-storage-service-dev"]
-          name    = "archivematica-storage-service-migrations"
-          command = ["sh"]
-          args    = ["-c", "python manage.py migrate --noinput"]
-          env {
-            name  = "DJANGO_SETTINGS_MODULE"
-            value = "storage_service.settings.local"
-          }
-          env {
-            name  = "FORWARDED_ALLOW_IPS"
-            value = "*"
-          }
-          env {
-            name  = "SS_GNUPG_HOME_PATH"
-            value = "/var/archivematica/storage_service/.gnupg"
-          }
-          env {
-            name  = "SS_GUNICORN_ACCESSLOG"
-            value = "/dev/null"
-          }
-          env {
-            name  = "SS_GUNICORN_RELOAD"
-            value = "true"
-          }
-          env {
-            name  = "SS_GUNICORN_RELOAD_ENGINE"
-            value = "auto"
-          }
-          env {
-            name = "SS_DB_URL"
-            value_from {
-              secret_key_ref {
-                name     = "dev-archivematica-secrets"
-                key      = "SS_DB_URL"
-                optional = false
-              }
-            }
-          }
-        }
-        init_container {
-          image   = local.desired_images["archivematica-storage-service-dev"]
-          name  = "archivematica-storage-service-create-user"
-          env {
-            name  = "DJANGO_SETTINGS_MODULE"
-            value = "storage_service.settings.local"
-          }
-          env {
-            name  = "FORWARDED_ALLOW_IPS"
-            value = "*"
-          }
-          env {
-            name  = "SS_GNUPG_HOME_PATH"
-            value = "/var/archivematica/storage_service/.gnupg"
-          }
-          env {
-            name  = "SS_GUNICORN_ACCESSLOG"
-            value = "/dev/null"
-          }
-          env {
-            name  = "SS_GUNICORN_RELOAD"
-            value = "true"
-          }
-          env {
-            name  = "SS_GUNICORN_RELOAD_ENGINE"
-            value = "auto"
-          }
-          env {
-            name = "SS_DB_URL"
-            value_from {
-              secret_key_ref {
-                name     = "dev-archivematica-secrets"
-                key      = "SS_DB_URL"
-                optional = false
-              }
-            }
-          }
-          env {
-            name  = "AM_SS_USERNAME"
-            value = "admin"
-          }
-          env {
-            name  = "AM_SS_EMAIL"
-            value = "engineers@permanent.org"
-          }
-          env {
-            name = "AM_SS_PASSWORD"
-            value_from {
-              secret_key_ref {
-                name     = "dev-archivematica-secrets"
-                key      = "AM_SS_PASSWORD"
-                optional = false
-              }
-            }
-          }
-          env {
-            name = "AM_SS_API_KEY"
-            value_from {
-              secret_key_ref {
-                name     = "dev-archivematica-secrets"
-                key      = "AM_SS_API_KEY"
-                optional = false
-              }
-            }
-          }
-          command = ["sh"]
-          args    = ["-c", "python manage.py create_user --username=$(AM_SS_USERNAME) --password='$(AM_SS_PASSWORD)' --email=$(AM_SS_EMAIL) --api-key=$(AM_SS_API_KEY) --superuser"]
-        }
-        init_container {
-          image   = local.desired_images["archivematica-dashboard-dev"]
-          name    = "archivematica-dashboard-migration"
-          command = ["sh"]
-          args    = ["-c", "python /src/src/dashboard/src/manage.py migrate --noinput"]
-          env {
-            name  = "DJANGO_SETTINGS_MODULE"
-            value = "settings.local"
-          }
-          env {
-            name  = "FORWARDED_ALLOW_IPS"
-            value = "*"
-          }
-          env {
-            name  = "AM_GUNICORN_ACCESSLOG"
-            value = "/dev/null"
-          }
-          env {
-            name  = "AM_GUNICORN_RELOAD"
-            value = "true"
-          }
-          env {
-            name  = "AM_GUNICORN_RELOAD_ENGINE"
-            value = "auto"
-          }
-          env {
-            name  = "ARCHIVEMATICA_DASHBOARD_EMAIL_PORT"
-            value = "587"
-          }
-          env {
-            name  = "ARCHIVEMATICA_DASHBOARD_CLIENT_PORT"
-            value = "3306"
-          }
-          env {
-            name  = "ARCHIVEMATICA_DASHBOARD_CLIENT_DATABASE"
-            value = "MCP"
-          }
-          env {
-            name = "ARCHIVEMATICA_DASHBOARD_CLIENT_HOST"
-            value_from {
-              secret_key_ref {
-                name     = "dev-archivematica-secrets"
-                key      = "ARCHIVEMATICA_DASHBOARD_CLIENT_HOST"
-                optional = false
-              }
-            }
-          }
-          env {
-            name  = "ARCHIVEMATICA_DASHBOARD_CLIENT_USER"
-            value = "archivematica"
-          }
-          env {
-            name = "ARCHIVEMATICA_DASHBOARD_CLIENT_PASSWORD"
-            value_from {
-              secret_key_ref {
-                name     = "dev-archivematica-secrets"
-                key      = "ARCHIVEMATICA_DASHBOARD_CLIENT_PASSWORD"
-                optional = false
-              }
-            }
-          }
-        }
-        init_container {
-          image   = local.desired_images["archivematica-storage-service-dev"]
-          name    = "archivematica-rclone-configuration"
-          command = ["sh"]
-          args    = ["-c", "rclone config create permanentb2 b2 account $(BACKBLAZE_KEY_ID) key $(BACKBLAZE_APPLICATION_KEY) --obscure"]
-          env {
-            name = "BACKBLAZE_KEY_ID"
-            value_from {
-              secret_key_ref {
-                name     = "dev-archivematica-secrets"
-                key      = "BACKBLAZE_KEY_ID"
-                optional = false
-              }
-            }
-          }
-          env {
-            name = "BACKBLAZE_APPLICATION_KEY"
-            value_from {
-              secret_key_ref {
-                name     = "dev-archivematica-secrets"
-                key      = "BACKBLAZE_APPLICATION_KEY"
-                optional = false
-              }
-            }
-          }
-          env {
-            name  = "RCLONE_CONFIG"
-            value = "/var/archivematica/storage_service/.rclone.conf"
-          }
-          volume_mount {
-            mount_path = "/var/archivematica/storage_service"
-            name       = "dev-staging-data"
-          }
-        }
-        volume {
-          name = "dev-pipeline-data"
-          persistent_volume_claim {
-            claim_name = "dev-pipeline-data"
-          }
-        }
-        volume {
-          name = "dev-staging-data"
-          persistent_volume_claim {
-            claim_name = "dev-staging-data"
-          }
-        }
-        volume {
-          name = "dev-location-data"
-          persistent_volume_claim {
-            claim_name = "dev-location-data"
-          }
-        }
-        volume {
-          name = "dev-transfer-share"
-          persistent_volume_claim {
-            claim_name = "dev-transfer-share"
-          }
-        }
-        volume {
-          name = "dev-storage-share"
-          persistent_volume_claim {
-            claim_name = "dev-storage-share"
-          }
-        }
-      }
-    }
-  }
-}
-
-data "kubernetes_resource" "mcp_client_dev" {
-  count = kubernetes_deployment.mcp_client_dev.metadata[0].name != "" ? 1 : 0
-  kind        = "Deployment"
-  api_version = "apps/v1"
-  metadata { name = "archivematica-mcp-client-dev" }
-}
-
-resource "kubernetes_deployment" "mcp_client_dev" {
-  metadata {
-    name = "archivematica-mcp-client-dev"
-    labels = {
-      App         = "archivematica-dev"
-      Environment = "dev"
-    }
-  }
-  spec {
-    replicas = 4
-    selector {
-      match_labels = {
-        App = "archivematica-mcp-client-dev"
-      }
-    }
-    template {
-      metadata {
-        labels = {
-          App = "archivematica-mcp-client-dev"
-        }
-      }
-      spec {
-        container {
-          image = local.desired_images["archivematica-mcp-client-dev"]
-          name  = "archivematica-mcp-client-dev"
-          env {
-            name = "DJANGO_SECRET_KEY"
-            value_from {
-              secret_key_ref {
-                name     = "dev-archivematica-secrets"
-                key      = "DJANGO_SECRET_KEY"
-                optional = false
-              }
-            }
-          }
-          env {
-            name  = "DJANGO_SETTINGS_MODULE"
-            value = "settings.common"
-          }
-          env {
-            name  = "ARCHIVEMATICA_MCPCLIENT_EMAIL_BACKEND"
-            value = "django.core.mail.backends.smtp.EmailBackend"
-          }
-          env {
-            name  = "ARCHIVEMATICA_MCPCLIENT_EMAIL_HOST"
-            value = "smtp.sendgrid.net"
-          }
-          env {
-            name  = "ARCHIVEMATICA_MCPCLIENT_EMAIL_PORT"
-            value = "587"
-          }
-          env {
-            name  = "ARCHIVEMATICA_MCPCLIENT_CLIENT_USER"
-            value = "archivematica"
-          }
-          env {
-            name = "ARCHIVEMATICA_MCPCLIENT_CLIENT_PASSWORD"
-            value_from {
-              secret_key_ref {
-                name     = "dev-archivematica-secrets"
-                key      = "ARCHIVEMATICA_DASHBOARD_CLIENT_PASSWORD"
-                optional = false
-              }
-            }
-          }
-          env {
-            name = "ARCHIVEMATICA_MCPCLIENT_CLIENT_HOST"
-            value_from {
-              secret_key_ref {
-                name     = "dev-archivematica-secrets"
-                key      = "ARCHIVEMATICA_DASHBOARD_CLIENT_HOST"
-                optional = false
-              }
-            }
-          }
-          env {
-            name  = "ARCHIVEMATICA_MCPCLIENT_CLIENT_DATABASE"
-            value = "MCP"
-          }
-          env {
-            name  = "ARCHIVEMATICA_MCPCLIENT_MCPCLIENT_MCPARCHIVEMATICASERVER"
-            value = "archivematica-gearman-dev:4730"
-          }
-          env {
-            name  = "ARCHIVEMATICA_MCPCLIENT_MCPCLIENT_SEARCH_ENABLED"
-            value = "false"
-          }
-          env {
-            name  = "ARCHIVEMATICA_MCPCLIENT_MCPCLIENT_CAPTURE_CLIENT_SCRIPT_OUTPUT"
-            value = "true"
-          }
-          env {
-            name  = "ARCHIVEMATICA_MCPCLIENT_MCPCLIENT_STORAGE_SERVICE_CLIENT_QUICK_TIMEOUT"
-            value = "20"
-          }
-          resources {
-            requests = {
-              memory = "256Mi"
-              cpu    = "1m"
-            }
-            limits = {
-              memory = "2048Mi"
-              cpu    = "1000m"
-            }
-          }
-          volume_mount {
-            mount_path = "/var/archivematica/sharedDirectory"
-            name       = "dev-pipeline-data"
-          }
-          volume_mount {
-            mount_path = "/home/transfer"
-            name       = "dev-transfer-share"
-          }
-        }
-        volume {
-          name = "dev-pipeline-data"
-          persistent_volume_claim {
-            claim_name = "dev-pipeline-data"
-          }
-        }
-        volume {
-          name = "dev-transfer-share"
-          persistent_volume_claim {
-            claim_name = "dev-transfer-share"
-          }
-        }
-      }
-    }
-  }
-}
-
-resource "kubernetes_service" "archivematica_dashboard_service_dev" {
-  metadata {
-    name = "archivematica-dashboard-dev"
-  }
-  spec {
-    type = "ClusterIP"
-    selector = {
-      App = "archivematica-dev"
-    }
-    port {
-      port        = 8001
-      target_port = 8001
-    }
-  }
-}
-
-resource "kubernetes_service" "archivematica_storage_service_dev" {
-  metadata {
-    name = "archivematica-storage-dev"
-  }
-  spec {
-    type = "ClusterIP"
-    selector = {
-      App = "archivematica-dev"
-    }
-    port {
-      port        = 8002
-      target_port = 8002
-    }
-  }
-}
-
-resource "kubernetes_persistent_volume_claim" "archivematica_dev_pipeline_data_pvc" {
-  metadata {
-    name = "dev-pipeline-data"
-  }
-  spec {
-    access_modes = ["ReadWriteOnce"]
-    resources {
-      requests = {
-        storage = "8Gi"
-      }
-    }
-
-    storage_class_name = "gp3"
-  }
-}
-
-resource "kubernetes_persistent_volume_claim" "archivematica_dev_staging_data_pvc" {
-  metadata {
-    name = "dev-staging-data"
-  }
-  spec {
-    access_modes = ["ReadWriteOnce"]
-    resources {
-      requests = {
-        storage = "2Gi"
-      }
-    }
-
-    storage_class_name = "gp2"
-  }
-}
-
-resource "kubernetes_persistent_volume_claim" "archivematica_dev_location_data_pvc" {
-  metadata {
-    name = "dev-location-data"
-  }
-  spec {
-    access_modes = ["ReadWriteOnce"]
-    resources {
-      requests = {
-        storage = "2Gi"
-      }
-    }
-
-    storage_class_name = "gp2"
-  }
-}
-
-resource "kubernetes_persistent_volume_claim" "archivematica_dev_transfer_share_pvc" {
-  metadata {
-    name = "dev-transfer-share"
-  }
-  spec {
-    access_modes = ["ReadWriteOnce"]
-    resources {
-      requests = {
-        storage = "2Gi"
-      }
-    }
-
-    storage_class_name = "gp2"
-  }
-}
-
-resource "kubernetes_persistent_volume_claim" "archivematica_dev_storage_share_pvc" {
-  metadata {
-    name = "dev-storage-share"
-  }
-  spec {
-    access_modes = ["ReadWriteOnce"]
-    resources {
-      requests = {
-        storage = "2Gi"
-      }
-    }
-
-    storage_class_name = "gp2"
-  }
-}
diff --git a/archivematica/test_cluster/dev_archivematica_deployment.tf b/archivematica/test_cluster/dev_archivematica_deployment.tf
index dfd082d..354d18b 100644
--- a/archivematica/test_cluster/dev_archivematica_deployment.tf
+++ b/archivematica/test_cluster/dev_archivematica_deployment.tf
@@ -53,7 +53,7 @@ resource "kubernetes_deployment" "archivematica_dev" {
           }
           env {
             name  = "DJANGO_SETTINGS_MODULE"
-            value = "storage_service.settings.production"
+            value = "archivematica.storage_service.storage_service.settings.production"
           }
           env {
             name  = "FORWARDED_ALLOW_IPS"
@@ -177,7 +177,7 @@ resource "kubernetes_deployment" "archivematica_dev" {
           }
           env {
             name  = "AM_GUNICORN_CHDIR"
-            value = "/src/src/archivematicaCommon/lib/"
+            value = "/src/src/archivematica/archivematicaCommon"
           }
           env {
             name  = "ARCHIVEMATICA_DASHBOARD_EMAIL_PORT"
@@ -268,7 +268,7 @@ resource "kubernetes_deployment" "archivematica_dev" {
           }
           env {
             name  = "DJANGO_SETTINGS_MODULE"
-            value = "settings.common"
+            value = "archivematica.MCPServer.settings.common"
           }
           env {
             name  = "ARCHIVEMATICA_MCPSERVER_CLIENT_USER"
@@ -341,10 +341,10 @@ resource "kubernetes_deployment" "archivematica_dev" {
           image   = local.desired_images["archivematica-storage-service-dev"]
           name    = "archivematica-storage-service-migrations"
           command = ["sh"]
-          args    = ["-c", "python manage.py migrate --noinput"]
+          args    = ["-c", "python -m archivematica.storage_service.manage migrate --noinput"]
           env {
             name  = "DJANGO_SETTINGS_MODULE"
-            value = "storage_service.settings.local"
+            value = "archivematica.storage_service.storage_service.settings.local"
           }
           env {
             name  = "FORWARDED_ALLOW_IPS"
@@ -382,7 +382,7 @@ resource "kubernetes_deployment" "archivematica_dev" {
           name  = "archivematica-storage-service-create-user"
           env {
             name  = "DJANGO_SETTINGS_MODULE"
-            value = "storage_service.settings.local"
+            value = "archivematica.storage_service.storage_service.settings.local"
           }
           env {
             name  = "FORWARDED_ALLOW_IPS"
@@ -443,13 +443,13 @@ resource "kubernetes_deployment" "archivematica_dev" {
             }
           }
           command = ["sh"]
-          args    = ["-c", "python manage.py create_user --username=$(AM_SS_USERNAME) --password='$(AM_SS_PASSWORD)' --email=$(AM_SS_EMAIL) --api-key=$(AM_SS_API_KEY) --superuser"]
+          args    = ["-c", "python -m archivematica.storage_service.manage create_user --username=$(AM_SS_USERNAME) --password='$(AM_SS_PASSWORD)' --email=$(AM_SS_EMAIL) --api-key=$(AM_SS_API_KEY) --superuser"]
         }
         init_container {
           image   = local.desired_images["archivematica-dashboard-dev"]
           name    = "archivematica-dashboard-migration"
           command = ["sh"]
-          args    = ["-c", "python /src/src/dashboard/src/manage.py migrate --noinput"]
+          args    = ["-c", "python /src/src/archivematica/dashboard/manage.py migrate --noinput"]
           env {
             name  = "DJANGO_SETTINGS_MODULE"
             value = "settings.local"
@@ -627,7 +627,7 @@ resource "kubernetes_deployment" "mcp_client_dev" {
           }
           env {
             name  = "DJANGO_SETTINGS_MODULE"
-            value = "settings.common"
+            value = "archivematica.MCPClient.settings.common"
           }
           env {
             name  = "ARCHIVEMATICA_MCPCLIENT_EMAIL_BACKEND"
diff --git a/archivematica/test_cluster/staging_archivematica_deployment.tf b/archivematica/test_cluster/staging_archivematica_deployment.tf
index 97041e8..d08228b 100644
--- a/archivematica/test_cluster/staging_archivematica_deployment.tf
+++ b/archivematica/test_cluster/staging_archivematica_deployment.tf
@@ -53,7 +53,7 @@ resource "kubernetes_deployment" "archivematica_staging" {
           }
           env {
             name  = "DJANGO_SETTINGS_MODULE"
-            value = "storage_service.settings.production"
+            value = "archivematica.storage_service.storage_service.settings.production"
           }
           env {
             name  = "FORWARDED_ALLOW_IPS"
@@ -177,7 +177,7 @@ resource "kubernetes_deployment" "archivematica_staging" {
           }
           env {
             name  = "AM_GUNICORN_CHDIR"
-            value = "/src/src/archivematicaCommon/lib/"
+            value = "/src/src/archivematica/archivematicaCommon"
           }
           env {
             name  = "ARCHIVEMATICA_DASHBOARD_EMAIL_PORT"
@@ -268,7 +268,7 @@ resource "kubernetes_deployment" "archivematica_staging" {
           }
           env {
             name  = "DJANGO_SETTINGS_MODULE"
-            value = "settings.common"
+            value = "archivematica.MCPServer.settings.common"
           }
           env {
             name  = "ARCHIVEMATICA_MCPSERVER_CLIENT_USER"
@@ -341,10 +341,10 @@ resource "kubernetes_deployment" "archivematica_staging" {
           image   = local.desired_images["archivematica-storage-service-staging"]
           name    = "archivematica-storage-service-migrations"
           command = ["sh"]
-          args    = ["-c", "python manage.py migrate --noinput"]
+          args    = ["-c", "python -m archivematica.storage_service.manage migrate --noinput"]
           env {
             name  = "DJANGO_SETTINGS_MODULE"
-            value = "storage_service.settings.local"
+            value = "archivematica.storage_service.storage_service.settings.local"
           }
           env {
             name  = "FORWARDED_ALLOW_IPS"
@@ -382,7 +382,7 @@ resource "kubernetes_deployment" "archivematica_staging" {
           name  = "archivematica-storage-service-create-user"
           env {
             name  = "DJANGO_SETTINGS_MODULE"
-            value = "storage_service.settings.local"
+            value = "archivematica.storage_service.storage_service.settings.local"
           }
           env {
             name  = "FORWARDED_ALLOW_IPS"
@@ -443,13 +443,13 @@ resource "kubernetes_deployment" "archivematica_staging" {
             }
           }
           command = ["sh"]
-          args    = ["-c", "python manage.py create_user --username=$(AM_SS_USERNAME) --password='$(AM_SS_PASSWORD)' --email=$(AM_SS_EMAIL) --api-key='$(AM_SS_API_KEY)' --superuser"]
+          args    = ["-c", "python -m archivematica.storage_service.manage create_user --username=$(AM_SS_USERNAME) --password='$(AM_SS_PASSWORD)' --email=$(AM_SS_EMAIL) --api-key='$(AM_SS_API_KEY)' --superuser"]
         }
         init_container {
           image   = local.desired_images["archivematica-dashboard-staging"]
           name    = "archivematica-dashboard-migration"
           command = ["sh"]
-          args    = ["-c", "python /src/src/dashboard/src/manage.py migrate --noinput"]
+          args    = ["-c", "python /src/src/archivematica/dashboard/manage.py migrate --noinput"]
           env {
             name  = "DJANGO_SETTINGS_MODULE"
             value = "settings.local"
@@ -627,7 +627,7 @@ resource "kubernetes_deployment" "mcp_client_staging" {
           }
           env {
             name  = "DJANGO_SETTINGS_MODULE"
-            value = "settings.common"
+            value = "archivematica.MCPClient.settings.common"
           }
           env {
             name  = "ARCHIVEMATICA_MCPCLIENT_EMAIL_BACKEND"