diff --git a/openshift/kustomize/services/contentmigration-historic-audiovideo/base/config-map.yaml b/openshift/kustomize/services/contentmigration-historic-audiovideo/base/config-map.yaml
deleted file mode 100644
index e97a9c0722..0000000000
--- a/openshift/kustomize/services/contentmigration-historic-audiovideo/base/config-map.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-# Configuration settings
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: contentmigration-historic-audiovideo-service
-  namespace: default
-  annotations:
-    description: Content Migration HISTORIC service configuration settings
-    created-by: jeremy.foster
-  labels:
-    name: contentmigration-historic-audiovideo-service
-    part-of: tno
-    version: 1.0.0
-    component: contentmigration-historic-audiovideo-service
-    managed-by: kustomize
-data:
-  MAX_FAIL_LIMIT: "5"
-  VOLUME_PATH: /data
-  CONTENT_MIGRATION_MEDIA_HOST_ROOT_URI: "https://tno.gov.bc.ca/av"
-  # Filter per instance
-  INGEST_TYPES: "TNO-AudioVideo"
-  SUPPORTED_IMPORT_MIGRATION_TYPES: "Historic,All"
-  DEFAULT_USERNAME_FOR_AUDIT: "contentmigrator"
-  GENERATE_ALERTS_ON_CONTENT_MIGRATION: "true"
-  CHES_EMAIL_ENABLED: "true"
-  CHES_EMAIL_AUTHORIZED: "true"
-  DATA_LOCATION: Openshift-AudioVideo
-  MAX_RECORDS_PER_RETRIEVAL: "250"
diff --git a/openshift/kustomize/services/contentmigration-historic-audiovideo/base/deploy.yaml b/openshift/kustomize/services/contentmigration-historic-audiovideo/base/deploy.yaml
deleted file mode 100644
index 2559821e4a..0000000000
--- a/openshift/kustomize/services/contentmigration-historic-audiovideo/base/deploy.yaml
+++ /dev/null
@@ -1,223 +0,0 @@
----
-# How the app will be deployed to the pod.
-kind: DeploymentConfig
-apiVersion: apps.openshift.io/v1
-metadata:
-  name: contentmigration-historic-audiovideo-service
-  namespace: default
-  annotations:
-    description: Defines how to deploy contentmigration-historic-audiovideo-service
-    created-by: jeremy.foster
-  labels:
-    name: contentmigration-historic-audiovideo-service
-    part-of: tno
-    version: 1.0.0
-    component: contentmigration-historic-audiovideo-service
-    managed-by: kustomize
-spec:
-  replicas: 1
-  selector:
-    name: contentmigration-historic-audiovideo-service
-    part-of: tno
-    component: contentmigration-historic-audiovideo-service
-  strategy:
-    rollingParams:
-      intervalSeconds: 1
-      maxSurge: 25%
-      maxUnavailable: 25%
-      timeoutSeconds: 600
-      updatePeriodSeconds: 1
-    type: Rolling
-  template:
-    metadata:
-      name: contentmigration-historic-audiovideo-service
-      labels:
-        name: contentmigration-historic-audiovideo-service
-        part-of: tno
-        component: contentmigration-historic-audiovideo-service
-    spec:
-      volumes:
-        - name: ingest-storage
-          persistentVolumeClaim:
-            claimName: ingest-storage
-      containers:
-        - name: contentmigration-historic-audiovideo-service
-          image: ""
-          imagePullPolicy: Always
-          ports:
-            - containerPort: 8080
-              protocol: TCP
-          volumeMounts:
-            - name: ingest-storage
-              mountPath: /data
-          resources:
-            limits:
-              cpu: 25m
-              memory: 200Mi
-            requests:
-              cpu: 10m
-              memory: 128Mi
-          env:
-            # .NET Configuration
-            - name: ASPNETCORE_ENVIRONMENT
-              value: Production
-            - name: ASPNETCORE_URLS
-              value: http://+:8080
-
-            - name: Logging__LogLevel__TNO
-              value: Information
-
-            # Common Service Configuration
-            - name: Service__ApiUrl
-              valueFrom:
-                configMapKeyRef:
-                  name: services
-                  key: API_HOST_URL
-            - name: Service__EmailTo
-              valueFrom:
-                configMapKeyRef:
-                  name: services
-                  key: EMAIL_FAILURE_TO
-
-            # Authentication Configuration
-            - name: Auth__Keycloak__Authority
-              valueFrom:
-                configMapKeyRef:
-                  name: services
-                  key: KEYCLOAK_AUTHORITY
-            - name: Auth__Keycloak__Audience
-              valueFrom:
-                configMapKeyRef:
-                  name: services
-                  key: KEYCLOAK_AUDIENCE
-            - name: Auth__Keycloak__Secret
-              valueFrom:
-                secretKeyRef:
-                  name: keycloak
-                  key: KEYCLOAK_CLIENT_SECRET
-
-            # Content Migration Service Configuration
-            - name: Service__MaxFailLimit
-              valueFrom:
-                configMapKeyRef:
-                  name: contentmigration-historic-audiovideo-service
-                  key: MAX_FAIL_LIMIT
-            - name: Service__VolumePath
-              valueFrom:
-                configMapKeyRef:
-                  name: contentmigration-historic-audiovideo-service
-                  key: VOLUME_PATH
-            - name: Service__MediaHostRootUri
-              valueFrom:
-                configMapKeyRef:
-                  name: contentmigration-historic-audiovideo-service
-                  key: CONTENT_MIGRATION_MEDIA_HOST_ROOT_URI
-            - name: Service__IngestTypes
-              valueFrom:
-                configMapKeyRef:
-                  name: contentmigration-historic-audiovideo-service
-                  key: INGEST_TYPES
-            - name: Service__SupportedImportMigrationTypes
-              valueFrom:
-                configMapKeyRef:
-                  name: contentmigration-historic-audiovideo-service
-                  key: SUPPORTED_IMPORT_MIGRATION_TYPES
-            - name: Service__DefaultUserNameForAudit
-              valueFrom:
-                configMapKeyRef:
-                  name: contentmigration-historic-audiovideo-service
-                  key: DEFAULT_USERNAME_FOR_AUDIT
-            - name: Service__GenerateAlertsOnContentMigration
-              valueFrom:
-                configMapKeyRef:
-                  name: contentmigration-historic-audiovideo-service
-                  key: GENERATE_ALERTS_ON_CONTENT_MIGRATION
-            - name: Service__DataLocation
-              valueFrom:
-                configMapKeyRef:
-                  name: contentmigration-historic-audiovideo-service
-                  key: DATA_LOCATION
-            - name: Service__MaxRecordsPerRetrieval
-              valueFrom:
-                configMapKeyRef:
-                  name: contentmigration-historic-audiovideo-service
-                  key: MAX_RECORDS_PER_RETRIEVAL
-
-            # CHES Configuration
-            - name: CHES__From
-              valueFrom:
-                configMapKeyRef:
-                  name: ches
-                  key: CHES_FROM
-            - name: CHES__EmailEnabled
-              valueFrom:
-                configMapKeyRef:
-                  name: contentmigration-historic-audiovideo-service
-                  key: CHES_EMAIL_ENABLED
-            - name: CHES__EmailAuthorized
-              valueFrom:
-                configMapKeyRef:
-                  name: contentmigration-historic-audiovideo-service
-                  key: CHES_EMAIL_AUTHORIZED
-
-            - name: CHES__AuthUrl
-              valueFrom:
-                configMapKeyRef:
-                  name: ches
-                  key: CHES_AUTH_URL
-            - name: CHES__HostUri
-              valueFrom:
-                configMapKeyRef:
-                  name: ches
-                  key: CHES_HOST_URI
-            - name: CHES__Username
-              valueFrom:
-                secretKeyRef:
-                  name: ches
-                  key: USERNAME
-            - name: CHES__Password
-              valueFrom:
-                secretKeyRef:
-                  name: ches
-                  key: PASSWORD
-
-            # Container TimeZone Configuration
-            - name: TZ
-              value: America/Vancouver
-
-          livenessProbe:
-            httpGet:
-              path: "/health"
-              port: 8080
-              scheme: HTTP
-            initialDelaySeconds: 30
-            timeoutSeconds: 30
-            periodSeconds: 20
-            successThreshold: 1
-            failureThreshold: 3
-          readinessProbe:
-            httpGet:
-              path: "/health"
-              port: 8080
-              scheme: HTTP
-            initialDelaySeconds: 30
-            timeoutSeconds: 30
-            periodSeconds: 20
-            successThreshold: 1
-            failureThreshold: 3
-      dnsPolicy: ClusterFirst
-      restartPolicy: Always
-      securityContext: {}
-      terminationGracePeriodSeconds: 30
-  test: false
-  triggers:
-    - type: ConfigChange
-    - type: ImageChange
-      imageChangeParams:
-        automatic: true
-        containerNames:
-          - contentmigration-historic-audiovideo-service
-        from:
-          kind: ImageStreamTag
-          namespace: 9b301c-tools
-          name: contentmigration-service:dev
diff --git a/openshift/kustomize/services/contentmigration-historic-audiovideo/base/service.yaml b/openshift/kustomize/services/contentmigration-historic-audiovideo/base/service.yaml
deleted file mode 100644
index 757faa75ba..0000000000
--- a/openshift/kustomize/services/contentmigration-historic-audiovideo/base/service.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-# Open up ports to communicate with the app.
-kind: Service
-apiVersion: v1
-metadata:
-  name: contentmigration-historic-audiovideo-service
-  namespace: default
-  annotations:
-    description: Exposes and load balances the application pods.
-    created-by: jeremy.foster
-  labels:
-    name: contentmigration-historic-audiovideo-service
-    part-of: tno
-    version: 1.0.0
-    component: contentmigration-historic-audiovideo-service
-    managed-by: kustomize
-spec:
-  ports:
-    - name: 8080-tcp
-      port: 8080
-      protocol: TCP
-      targetPort: 8080
-  selector:
-    part-of: tno
-    component: contentmigration-historic-audiovideo-service
-  sessionAffinity: None
-  type: ClusterIP
diff --git a/openshift/kustomize/services/contentmigration-historic-audiovideo/overlays/dev/kustomization.yaml b/openshift/kustomize/services/contentmigration-historic-audiovideo/overlays/dev/kustomization.yaml
deleted file mode 100644
index f7c71801c8..0000000000
--- a/openshift/kustomize/services/contentmigration-historic-audiovideo/overlays/dev/kustomization.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-namespace: 9b301c-dev
-
-resources:
-  - ../../base
-
-generatorOptions:
-  disableNameSuffixHash: true
-
-patches:
-  - target:
-      kind: DeploymentConfig
-      name: contentmigration-historic-audiovideo-service
-    patch: |-
-      - op: replace
-        path: /spec/replicas
-        value: 1
-      - op: replace
-        path: /spec/template/spec/containers/0/resources/requests/cpu
-        value: 25m
-      - op: replace
-        path: /spec/template/spec/containers/0/resources/requests/memory
-        value: 128Mi
-      - op: replace
-        path: /spec/template/spec/containers/0/resources/limits/cpu
-        value: 150m
-      - op: replace
-        path: /spec/template/spec/containers/0/resources/limits/memory
-        value: 350Mi
-      - op: replace
-        path: /spec/triggers/1/imageChangeParams/from/name
-        value: contentmigration-service:dev
-      - op: replace
-        path: /spec/template/spec/containers/0/env/0/value
-        value: Development
diff --git a/openshift/kustomize/services/contentmigration-historic-audiovideo/overlays/prod/kustomization.yaml b/openshift/kustomize/services/contentmigration-historic-audiovideo/overlays/prod/kustomization.yaml
deleted file mode 100644
index 7ea673f8c6..0000000000
--- a/openshift/kustomize/services/contentmigration-historic-audiovideo/overlays/prod/kustomization.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-namespace: 9b301c-prod
-
-resources:
-  - ../../base
-
-generatorOptions:
-  disableNameSuffixHash: true
-
-patches:
-  - target:
-      kind: ConfigMap
-      name: contentmigration-historic-audiovideo-service
-    patch: |-
-      - op: replace
-        path: /data/GENERATE_ALERTS_ON_CONTENT_MIGRATION
-        value: "false"
-  - target:
-      kind: DeploymentConfig
-      name: contentmigration-historic-audiovideo-service
-    patch: |-
-      - op: replace
-        path: /spec/replicas
-        value: 1
-      - op: replace
-        path: /spec/template/spec/containers/0/resources/requests/cpu
-        value: 25m
-      - op: replace
-        path: /spec/template/spec/containers/0/resources/requests/memory
-        value: 128Mi
-      - op: replace
-        path: /spec/template/spec/containers/0/resources/limits/cpu
-        value: 150m
-      - op: replace
-        path: /spec/template/spec/containers/0/resources/limits/memory
-        value: 350Mi
-      - op: replace
-        path: /spec/triggers/1/imageChangeParams/from/name
-        value: contentmigration-service:prod
-      - op: replace
-        path: /spec/template/spec/containers/0/env/0/value
-        value: Production
diff --git a/openshift/kustomize/services/contentmigration-historic-audiovideo/overlays/test/kustomization.yaml b/openshift/kustomize/services/contentmigration-historic-audiovideo/overlays/test/kustomization.yaml
deleted file mode 100644
index dc02868dcc..0000000000
--- a/openshift/kustomize/services/contentmigration-historic-audiovideo/overlays/test/kustomization.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-namespace: 9b301c-test
-
-resources:
-  - ../../base
-
-generatorOptions:
-  disableNameSuffixHash: true
-
-patches:
-  - target:
-      kind: ConfigMap
-      name: contentmigration-historic-audiovideo-service
-    patch: |-
-      - op: replace
-        path: /data/GENERATE_ALERTS_ON_CONTENT_MIGRATION
-        value: "false"
-  - target:
-      kind: DeploymentConfig
-      name: contentmigration-historic-audiovideo-service
-    patch: |-
-      - op: replace
-        path: /spec/replicas
-        value: 1
-      - op: replace
-        path: /spec/template/spec/containers/0/resources/requests/cpu
-        value: 25m
-      - op: replace
-        path: /spec/template/spec/containers/0/resources/requests/memory
-        value: 128Mi
-      - op: replace
-        path: /spec/template/spec/containers/0/resources/limits/cpu
-        value: 150m
-      - op: replace
-        path: /spec/template/spec/containers/0/resources/limits/memory
-        value: 350Mi
-      - op: replace
-        path: /spec/triggers/1/imageChangeParams/from/name
-        value: contentmigration-service:test
-      - op: replace
-        path: /spec/template/spec/containers/0/env/0/value
-        value: Staging
diff --git a/openshift/kustomize/services/contentmigration-historic-image/base/config-map.yaml b/openshift/kustomize/services/contentmigration-historic-image/base/config-map.yaml
deleted file mode 100644
index 83ced405b9..0000000000
--- a/openshift/kustomize/services/contentmigration-historic-image/base/config-map.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-# Configuration settings
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: contentmigration-historic-image-service
-  namespace: default
-  annotations:
-    description: Content Migration HISTORIC service configuration settings
-    created-by: jeremy.foster
-  labels:
-    name: contentmigration-historic-image-service
-    part-of: tno
-    version: 1.0.0
-    component: contentmigration-historic-image-service
-    managed-by: kustomize
-data:
-  MAX_FAIL_LIMIT: "5"
-  VOLUME_PATH: /data
-  CONTENT_MIGRATION_MEDIA_HOST_ROOT_URI: "https://tno.gov.bc.ca/av"
-  # Filter per instance
-  INGEST_TYPES: "TNO-Image"
-  SUPPORTED_IMPORT_MIGRATION_TYPES: "Historic,All"
-  DEFAULT_USERNAME_FOR_AUDIT: "contentmigrator"
-  GENERATE_ALERTS_ON_CONTENT_MIGRATION: "true"
-  CHES_EMAIL_ENABLED: "true"
-  CHES_EMAIL_AUTHORIZED: "true"
-  DATA_LOCATION: Openshift-Image
-  MAX_RECORDS_PER_RETRIEVAL: "250"
diff --git a/openshift/kustomize/services/contentmigration-historic-image/base/kustomization.yaml b/openshift/kustomize/services/contentmigration-historic-image/base/kustomization.yaml
deleted file mode 100644
index 8075511b29..0000000000
--- a/openshift/kustomize/services/contentmigration-historic-image/base/kustomization.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-resources:
-  - config-map.yaml
-  - deploy.yaml
-  - service.yaml
-
-generatorOptions:
-  disableNameSuffixHash: true
diff --git a/openshift/kustomize/services/contentmigration-historic-image/base/service.yaml b/openshift/kustomize/services/contentmigration-historic-image/base/service.yaml
deleted file mode 100644
index fd53077263..0000000000
--- a/openshift/kustomize/services/contentmigration-historic-image/base/service.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-# Open up ports to communicate with the app.
-kind: Service
-apiVersion: v1
-metadata:
-  name: contentmigration-historic-image-service
-  namespace: default
-  annotations:
-    description: Exposes and load balances the application pods.
-    created-by: jeremy.foster
-  labels:
-    name: contentmigration-historic-image-service
-    part-of: tno
-    version: 1.0.0
-    component: contentmigration-historic-image-service
-    managed-by: kustomize
-spec:
-  ports:
-    - name: 8080-tcp
-      port: 8080
-      protocol: TCP
-      targetPort: 8080
-  selector:
-    part-of: tno
-    component: contentmigration-historic-image-service
-  sessionAffinity: None
-  type: ClusterIP
diff --git a/openshift/kustomize/services/contentmigration-historic-image/overlays/dev/kustomization.yaml b/openshift/kustomize/services/contentmigration-historic-image/overlays/dev/kustomization.yaml
deleted file mode 100644
index 4498b05315..0000000000
--- a/openshift/kustomize/services/contentmigration-historic-image/overlays/dev/kustomization.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-namespace: 9b301c-dev
-
-resources:
-  - ../../base
-
-generatorOptions:
-  disableNameSuffixHash: true
-
-patches:
-  - target:
-      kind: DeploymentConfig
-      name: contentmigration-historic-image-service
-    patch: |-
-      - op: replace
-        path: /spec/replicas
-        value: 1
-      - op: replace
-        path: /spec/template/spec/containers/0/resources/requests/cpu
-        value: 25m
-      - op: replace
-        path: /spec/template/spec/containers/0/resources/requests/memory
-        value: 128Mi
-      - op: replace
-        path: /spec/template/spec/containers/0/resources/limits/cpu
-        value: 150m
-      - op: replace
-        path: /spec/template/spec/containers/0/resources/limits/memory
-        value: 350Mi
-      - op: replace
-        path: /spec/triggers/1/imageChangeParams/from/name
-        value: contentmigration-service:dev
-      - op: replace
-        path: /spec/template/spec/containers/0/env/0/value
-        value: Development
diff --git a/openshift/kustomize/services/contentmigration-historic-image/overlays/test/kustomization.yaml b/openshift/kustomize/services/contentmigration-historic-image/overlays/test/kustomization.yaml
deleted file mode 100644
index 29713a189d..0000000000
--- a/openshift/kustomize/services/contentmigration-historic-image/overlays/test/kustomization.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-namespace: 9b301c-test
-
-resources:
-  - ../../base
-
-generatorOptions:
-  disableNameSuffixHash: true
-
-patches:
-  - target:
-      kind: ConfigMap
-      name: contentmigration-historic-image-service
-    patch: |-
-      - op: replace
-        path: /data/GENERATE_ALERTS_ON_CONTENT_MIGRATION
-        value: "false"
-  - target:
-      kind: DeploymentConfig
-      name: contentmigration-historic-image-service
-    patch: |-
-      - op: replace
-        path: /spec/replicas
-        value: 1
-      - op: replace
-        path: /spec/template/spec/containers/0/resources/requests/cpu
-        value: 25m
-      - op: replace
-        path: /spec/template/spec/containers/0/resources/requests/memory
-        value: 128Mi
-      - op: replace
-        path: /spec/template/spec/containers/0/resources/limits/cpu
-        value: 150m
-      - op: replace
-        path: /spec/template/spec/containers/0/resources/limits/memory
-        value: 350Mi
-      - op: replace
-        path: /spec/triggers/1/imageChangeParams/from/name
-        value: contentmigration-service:test
-      - op: replace
-        path: /spec/template/spec/containers/0/env/0/value
-        value: Staging
diff --git a/openshift/kustomize/services/contentmigration-historic-online/base/config-map.yaml b/openshift/kustomize/services/contentmigration-historic-online/base/config-map.yaml
deleted file mode 100644
index 630af30e14..0000000000
--- a/openshift/kustomize/services/contentmigration-historic-online/base/config-map.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-# Configuration settings
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: contentmigration-historic-online-service
-  namespace: default
-  annotations:
-    description: Content Migration HISTORIC service configuration settings
-    created-by: jeremy.foster
-  labels:
-    name: contentmigration-historic-online-service
-    part-of: tno
-    version: 1.0.0
-    component: contentmigration-historic-online-service
-    managed-by: kustomize
-data:
-  MAX_FAIL_LIMIT: "5"
-  VOLUME_PATH: /data
-  CONTENT_MIGRATION_MEDIA_HOST_ROOT_URI: "https://tno.gov.bc.ca/av"
-  # Filter per instance
-  INGEST_TYPES: "TNO-Story"
-  SUPPORTED_IMPORT_MIGRATION_TYPES: "Historic,All"
-  DEFAULT_USERNAME_FOR_AUDIT: "contentmigrator"
-  GENERATE_ALERTS_ON_CONTENT_MIGRATION: "true"
-  CHES_EMAIL_ENABLED: "true"
-  CHES_EMAIL_AUTHORIZED: "true"
-  DATA_LOCATION: Openshift-Online
-  MAX_RECORDS_PER_RETRIEVAL: "250"
diff --git a/openshift/kustomize/services/contentmigration-historic-online/base/deploy.yaml b/openshift/kustomize/services/contentmigration-historic-online/base/deploy.yaml
deleted file mode 100644
index f34cebf0f3..0000000000
--- a/openshift/kustomize/services/contentmigration-historic-online/base/deploy.yaml
+++ /dev/null
@@ -1,223 +0,0 @@
----
-# How the app will be deployed to the pod.
-kind: DeploymentConfig
-apiVersion: apps.openshift.io/v1
-metadata:
-  name: contentmigration-historic-online-service
-  namespace: default
-  annotations:
-    description: Defines how to deploy contentmigration-historic-online-service
-    created-by: jeremy.foster
-  labels:
-    name: contentmigration-historic-online-service
-    part-of: tno
-    version: 1.0.0
-    component: contentmigration-historic-online-service
-    managed-by: kustomize
-spec:
-  replicas: 1
-  selector:
-    name: contentmigration-historic-online-service
-    part-of: tno
-    component: contentmigration-historic-online-service
-  strategy:
-    rollingParams:
-      intervalSeconds: 1
-      maxSurge: 25%
-      maxUnavailable: 25%
-      timeoutSeconds: 600
-      updatePeriodSeconds: 1
-    type: Rolling
-  template:
-    metadata:
-      name: contentmigration-historic-online-service
-      labels:
-        name: contentmigration-historic-online-service
-        part-of: tno
-        component: contentmigration-historic-online-service
-    spec:
-      volumes:
-        - name: ingest-storage
-          persistentVolumeClaim:
-            claimName: ingest-storage
-      containers:
-        - name: contentmigration-historic-online-service
-          image: ""
-          imagePullPolicy: Always
-          ports:
-            - containerPort: 8080
-              protocol: TCP
-          volumeMounts:
-            - name: ingest-storage
-              mountPath: /data
-          resources:
-            limits:
-              cpu: 25m
-              memory: 200Mi
-            requests:
-              cpu: 10m
-              memory: 128Mi
-          env:
-            # .NET Configuration
-            - name: ASPNETCORE_ENVIRONMENT
-              value: Production
-            - name: ASPNETCORE_URLS
-              value: http://+:8080
-
-            - name: Logging__LogLevel__TNO
-              value: Information
-
-            # Common Service Configuration
-            - name: Service__ApiUrl
-              valueFrom:
-                configMapKeyRef:
-                  name: services
-                  key: API_HOST_URL
-            - name: Service__EmailTo
-              valueFrom:
-                configMapKeyRef:
-                  name: services
-                  key: EMAIL_FAILURE_TO
-
-            # Authentication Configuration
-            - name: Auth__Keycloak__Authority
-              valueFrom:
-                configMapKeyRef:
-                  name: services
-                  key: KEYCLOAK_AUTHORITY
-            - name: Auth__Keycloak__Audience
-              valueFrom:
-                configMapKeyRef:
-                  name: services
-                  key: KEYCLOAK_AUDIENCE
-            - name: Auth__Keycloak__Secret
-              valueFrom:
-                secretKeyRef:
-                  name: keycloak
-                  key: KEYCLOAK_CLIENT_SECRET
-
-            # Content Migration Service Configuration
-            - name: Service__MaxFailLimit
-              valueFrom:
-                configMapKeyRef:
-                  name: contentmigration-historic-online-service
-                  key: MAX_FAIL_LIMIT
-            - name: Service__VolumePath
-              valueFrom:
-                configMapKeyRef:
-                  name: contentmigration-historic-online-service
-                  key: VOLUME_PATH
-            - name: Service__MediaHostRootUri
-              valueFrom:
-                configMapKeyRef:
-                  name: contentmigration-historic-online-service
-                  key: CONTENT_MIGRATION_MEDIA_HOST_ROOT_URI
-            - name: Service__IngestTypes
-              valueFrom:
-                configMapKeyRef:
-                  name: contentmigration-historic-online-service
-                  key: INGEST_TYPES
-            - name: Service__SupportedImportMigrationTypes
-              valueFrom:
-                configMapKeyRef:
-                  name: contentmigration-historic-online-service
-                  key: SUPPORTED_IMPORT_MIGRATION_TYPES
-            - name: Service__DefaultUserNameForAudit
-              valueFrom:
-                configMapKeyRef:
-                  name: contentmigration-historic-online-service
-                  key: DEFAULT_USERNAME_FOR_AUDIT
-            - name: Service__GenerateAlertsOnContentMigration
-              valueFrom:
-                configMapKeyRef:
-                  name: contentmigration-historic-online-service
-                  key: GENERATE_ALERTS_ON_CONTENT_MIGRATION
-            - name: Service__DataLocation
-              valueFrom:
-                configMapKeyRef:
-                  name: contentmigration-historic-online-service
-                  key: DATA_LOCATION
-            - name: Service__MaxRecordsPerRetrieval
-              valueFrom:
-                configMapKeyRef:
-                  name: contentmigration-historic-online-service
-                  key: MAX_RECORDS_PER_RETRIEVAL
-
-            # CHES Configuration
-            - name: CHES__From
-              valueFrom:
-                configMapKeyRef:
-                  name: ches
-                  key: CHES_FROM
-            - name: CHES__EmailEnabled
-              valueFrom:
-                configMapKeyRef:
-                  name: contentmigration-historic-online-service
-                  key: CHES_EMAIL_ENABLED
-            - name: CHES__EmailAuthorized
-              valueFrom:
-                configMapKeyRef:
-                  name: contentmigration-historic-online-service
-                  key: CHES_EMAIL_AUTHORIZED
-
-            - name: CHES__AuthUrl
-              valueFrom:
-                configMapKeyRef:
-                  name: ches
-                  key: CHES_AUTH_URL
-            - name: CHES__HostUri
-              valueFrom:
-                configMapKeyRef:
-                  name: ches
-                  key: CHES_HOST_URI
-            - name: CHES__Username
-              valueFrom:
-                secretKeyRef:
-                  name: ches
-                  key: USERNAME
-            - name: CHES__Password
-              valueFrom:
-                secretKeyRef:
-                  name: ches
-                  key: PASSWORD
-
-            # Container TimeZone Configuration
-            - name: TZ
-              value: America/Vancouver
-
-          livenessProbe:
-            httpGet:
-              path: "/health"
-              port: 8080
-              scheme: HTTP
-            initialDelaySeconds: 30
-            timeoutSeconds: 30
-            periodSeconds: 20
-            successThreshold: 1
-            failureThreshold: 3
-          readinessProbe:
-            httpGet:
-              path: "/health"
-              port: 8080
-              scheme: HTTP
-            initialDelaySeconds: 30
-            timeoutSeconds: 30
-            periodSeconds: 20
-            successThreshold: 1
-            failureThreshold: 3
-      dnsPolicy: ClusterFirst
-      restartPolicy: Always
-      securityContext: {}
-      terminationGracePeriodSeconds: 30
-  test: false
-  triggers:
-    - type: ConfigChange
-    - type: ImageChange
-      imageChangeParams:
-        automatic: true
-        containerNames:
-          - contentmigration-historic-online-service
-        from:
-          kind: ImageStreamTag
-          namespace: 9b301c-tools
-          name: contentmigration-service:dev
diff --git a/openshift/kustomize/services/contentmigration-historic-online/base/kustomization.yaml b/openshift/kustomize/services/contentmigration-historic-online/base/kustomization.yaml
deleted file mode 100644
index 8075511b29..0000000000
--- a/openshift/kustomize/services/contentmigration-historic-online/base/kustomization.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-resources:
-  - config-map.yaml
-  - deploy.yaml
-  - service.yaml
-
-generatorOptions:
-  disableNameSuffixHash: true
diff --git a/openshift/kustomize/services/contentmigration-historic-online/base/service.yaml b/openshift/kustomize/services/contentmigration-historic-online/base/service.yaml
deleted file mode 100644
index f7443e355e..0000000000
--- a/openshift/kustomize/services/contentmigration-historic-online/base/service.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-# Open up ports to communicate with the app.
-kind: Service
-apiVersion: v1
-metadata:
-  name: contentmigration-historic-online-service
-  namespace: default
-  annotations:
-    description: Exposes and load balances the application pods.
-    created-by: jeremy.foster
-  labels:
-    name: contentmigration-historic-online-service
-    part-of: tno
-    version: 1.0.0
-    component: contentmigration-historic-online-service
-    managed-by: kustomize
-spec:
-  ports:
-    - name: 8080-tcp
-      port: 8080
-      protocol: TCP
-      targetPort: 8080
-  selector:
-    part-of: tno
-    component: contentmigration-historic-online-service
-  sessionAffinity: None
-  type: ClusterIP
diff --git a/openshift/kustomize/services/contentmigration-historic-online/overlays/dev/kustomization.yaml b/openshift/kustomize/services/contentmigration-historic-online/overlays/dev/kustomization.yaml
deleted file mode 100644
index 27a0bd447b..0000000000
--- a/openshift/kustomize/services/contentmigration-historic-online/overlays/dev/kustomization.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-namespace: 9b301c-dev
-
-resources:
-  - ../../base
-
-generatorOptions:
-  disableNameSuffixHash: true
-
-patches:
-  - target:
-      kind: DeploymentConfig
-      name: contentmigration-historic-online-service
-    patch: |-
-      - op: replace
-        path: /spec/replicas
-        value: 1
-      - op: replace
-        path: /spec/template/spec/containers/0/resources/requests/cpu
-        value: 25m
-      - op: replace
-        path: /spec/template/spec/containers/0/resources/requests/memory
-        value: 128Mi
-      - op: replace
-        path: /spec/template/spec/containers/0/resources/limits/cpu
-        value: 150m
-      - op: replace
-        path: /spec/template/spec/containers/0/resources/limits/memory
-        value: 350Mi
-      - op: replace
-        path: /spec/triggers/1/imageChangeParams/from/name
-        value: contentmigration-service:dev
-      - op: replace
-        path: /spec/template/spec/containers/0/env/0/value
-        value: Development
diff --git a/openshift/kustomize/services/contentmigration-historic-online/overlays/prod/kustomization.yaml b/openshift/kustomize/services/contentmigration-historic-online/overlays/prod/kustomization.yaml
deleted file mode 100644
index 7e85eef5d4..0000000000
--- a/openshift/kustomize/services/contentmigration-historic-online/overlays/prod/kustomization.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-namespace: 9b301c-prod
-
-resources:
-  - ../../base
-
-generatorOptions:
-  disableNameSuffixHash: true
-
-patches:
-  - target:
-      kind: ConfigMap
-      name: contentmigration-historic-online-service
-    patch: |-
-      - op: replace
-        path: /data/GENERATE_ALERTS_ON_CONTENT_MIGRATION
-        value: "false"
-  - target:
-      kind: DeploymentConfig
-      name: contentmigration-historic-online-service
-    patch: |-
-      - op: replace
-        path: /spec/replicas
-        value: 1
-      - op: replace
-        path: /spec/template/spec/containers/0/resources/requests/cpu
-        value: 25m
-      - op: replace
-        path: /spec/template/spec/containers/0/resources/requests/memory
-        value: 128Mi
-      - op: replace
-        path: /spec/template/spec/containers/0/resources/limits/cpu
-        value: 150m
-      - op: replace
-        path: /spec/template/spec/containers/0/resources/limits/memory
-        value: 350Mi
-      - op: replace
-        path: /spec/triggers/1/imageChangeParams/from/name
-        value: contentmigration-service:prod
-      - op: replace
-        path: /spec/template/spec/containers/0/env/0/value
-        value: Production
diff --git a/openshift/kustomize/services/contentmigration-historic-online/overlays/test/kustomization.yaml b/openshift/kustomize/services/contentmigration-historic-online/overlays/test/kustomization.yaml
deleted file mode 100644
index e9d4a91c02..0000000000
--- a/openshift/kustomize/services/contentmigration-historic-online/overlays/test/kustomization.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-namespace: 9b301c-test
-
-resources:
-  - ../../base
-
-generatorOptions:
-  disableNameSuffixHash: true
-
-patches:
-  - target:
-      kind: ConfigMap
-      name: contentmigration-historic-online-service
-    patch: |-
-      - op: replace
-        path: /data/GENERATE_ALERTS_ON_CONTENT_MIGRATION
-        value: "false"
-  - target:
-      kind: DeploymentConfig
-      name: contentmigration-historic-online-service
-    patch: |-
-      - op: replace
-        path: /spec/replicas
-        value: 1
-      - op: replace
-        path: /spec/template/spec/containers/0/resources/requests/cpu
-        value: 25m
-      - op: replace
-        path: /spec/template/spec/containers/0/resources/requests/memory
-        value: 128Mi
-      - op: replace
-        path: /spec/template/spec/containers/0/resources/limits/cpu
-        value: 150m
-      - op: replace
-        path: /spec/template/spec/containers/0/resources/limits/memory
-        value: 350Mi
-      - op: replace
-        path: /spec/triggers/1/imageChangeParams/from/name
-        value: contentmigration-service:test
-      - op: replace
-        path: /spec/template/spec/containers/0/env/0/value
-        value: Staging
diff --git a/openshift/kustomize/services/contentmigration-historic-print/base/deploy.yaml b/openshift/kustomize/services/contentmigration-historic-print/base/deploy.yaml
deleted file mode 100644
index 6ea8b61b5b..0000000000
--- a/openshift/kustomize/services/contentmigration-historic-print/base/deploy.yaml
+++ /dev/null
@@ -1,223 +0,0 @@
----
-# How the app will be deployed to the pod.
-kind: DeploymentConfig
-apiVersion: apps.openshift.io/v1
-metadata:
-  name: contentmigration-historic-print-service
-  namespace: default
-  annotations:
-    description: Defines how to deploy contentmigration-historic-print-service
-    created-by: jeremy.foster
-  labels:
-    name: contentmigration-historic-print-service
-    part-of: tno
-    version: 1.0.0
-    component: contentmigration-historic-print-service
-    managed-by: kustomize
-spec:
-  replicas: 1
-  selector:
-    name: contentmigration-historic-print-service
-    part-of: tno
-    component: contentmigration-historic-print-service
-  strategy:
-    rollingParams:
-      intervalSeconds: 1
-      maxSurge: 25%
-      maxUnavailable: 25%
-      timeoutSeconds: 600
-      updatePeriodSeconds: 1
-    type: Rolling
-  template:
-    metadata:
-      name: contentmigration-historic-print-service
-      labels:
-        name: contentmigration-historic-print-service
-        part-of: tno
-        component: contentmigration-historic-print-service
-    spec:
-      volumes:
-        - name: ingest-storage
-          persistentVolumeClaim:
-            claimName: ingest-storage
-      containers:
-        - name: contentmigration-historic-print-service
-          image: ""
-          imagePullPolicy: Always
-          ports:
-            - containerPort: 8080
-              protocol: TCP
-          volumeMounts:
-            - name: ingest-storage
-              mountPath: /data
-          resources:
-            limits:
-              cpu: 25m
-              memory: 200Mi
-            requests:
-              cpu: 10m
-              memory: 128Mi
-          env:
-            # .NET Configuration
-            - name: ASPNETCORE_ENVIRONMENT
-              value: Production
-            - name: ASPNETCORE_URLS
-              value: http://+:8080
-
-            - name: Logging__LogLevel__TNO
-              value: Information
-
-            # Common Service Configuration
-            - name: Service__ApiUrl
-              valueFrom:
-                configMapKeyRef:
-                  name: services
-                  key: API_HOST_URL
-            - name: Service__EmailTo
-              valueFrom:
-                configMapKeyRef:
-                  name: services
-                  key: EMAIL_FAILURE_TO
-
-            # Authentication Configuration
-            - name: Auth__Keycloak__Authority
-              valueFrom:
-                configMapKeyRef:
-                  name: services
-                  key: KEYCLOAK_AUTHORITY
-            - name: Auth__Keycloak__Audience
-              valueFrom:
-                configMapKeyRef:
-                  name: services
-                  key: KEYCLOAK_AUDIENCE
-            - name: Auth__Keycloak__Secret
-              valueFrom:
-                secretKeyRef:
-                  name: keycloak
-                  key: KEYCLOAK_CLIENT_SECRET
-
-            # Content Migration Service Configuration
-            - name: Service__MaxFailLimit
-              valueFrom:
-                configMapKeyRef:
-                  name: contentmigration-historic-print-service
-                  key: MAX_FAIL_LIMIT
-            - name: Service__VolumePath
-              valueFrom:
-                configMapKeyRef:
-                  name: contentmigration-historic-print-service
-                  key: VOLUME_PATH
-            - name: Service__MediaHostRootUri
-              valueFrom:
-                configMapKeyRef:
-                  name: contentmigration-historic-print-service
-                  key: CONTENT_MIGRATION_MEDIA_HOST_ROOT_URI
-            - name: Service__IngestTypes
-              valueFrom:
-                configMapKeyRef:
-                  name: contentmigration-historic-print-service
-                  key: INGEST_TYPES
-            - name: Service__SupportedImportMigrationTypes
-              valueFrom:
-                configMapKeyRef:
-                  name: contentmigration-historic-print-service
-                  key: SUPPORTED_IMPORT_MIGRATION_TYPES
-            - name: Service__DefaultUserNameForAudit
-              valueFrom:
-                configMapKeyRef:
-                  name: contentmigration-historic-print-service
-                  key: DEFAULT_USERNAME_FOR_AUDIT
-            - name: Service__GenerateAlertsOnContentMigration
-              valueFrom:
-                configMapKeyRef:
-                  name: contentmigration-historic-print-service
-                  key: GENERATE_ALERTS_ON_CONTENT_MIGRATION
-            - name: Service__DataLocation
-              valueFrom:
-                configMapKeyRef:
-                  name: contentmigration-historic-print-service
-                  key: DATA_LOCATION
-            - name: Service__MaxRecordsPerRetrieval
-              valueFrom:
-                configMapKeyRef:
-                  name: contentmigration-historic-print-service
-                  key: MAX_RECORDS_PER_RETRIEVAL
-
-            # CHES Configuration
-            - name: CHES__From
-              valueFrom:
-                configMapKeyRef:
-                  name: ches
-                  key: CHES_FROM
-            - name: CHES__EmailEnabled
-              valueFrom:
-                configMapKeyRef:
-                  name: contentmigration-historic-print-service
-                  key: CHES_EMAIL_ENABLED
-            - name: CHES__EmailAuthorized
-              valueFrom:
-                configMapKeyRef:
-                  name: contentmigration-historic-print-service
-                  key: CHES_EMAIL_AUTHORIZED
-
-            - name: CHES__AuthUrl
-              valueFrom:
-                configMapKeyRef:
-                  name: ches
-                  key: CHES_AUTH_URL
-            - name: CHES__HostUri
-              valueFrom:
-                configMapKeyRef:
-                  name: ches
-                  key: CHES_HOST_URI
-            - name: CHES__Username
-              valueFrom:
-                secretKeyRef:
-                  name: ches
-                  key: USERNAME
-            - name: CHES__Password
-              valueFrom:
-                secretKeyRef:
-                  name: ches
-                  key: PASSWORD
-
-            # Container TimeZone Configuration
-            - name: TZ
-              value: America/Vancouver
-
-          livenessProbe:
-            httpGet:
-              path: "/health"
-              port: 8080
-              scheme: HTTP
-            initialDelaySeconds: 30
-            timeoutSeconds: 30
-            periodSeconds: 20
-            successThreshold: 1
-            failureThreshold: 3
-          readinessProbe:
-            httpGet:
-              path: "/health"
-              port: 8080
-              scheme: HTTP
-            initialDelaySeconds: 30
-            timeoutSeconds: 30
-            periodSeconds: 20
-            successThreshold: 1
-            failureThreshold: 3
-      dnsPolicy: ClusterFirst
-      restartPolicy: Always
-      securityContext: {}
-      terminationGracePeriodSeconds: 30
-  test: false
-  triggers:
-    - type: ConfigChange
-    - type: ImageChange
-      imageChangeParams:
-        automatic: true
-        containerNames:
-          - contentmigration-historic-print-service
-        from:
-          kind: ImageStreamTag
-          namespace: 9b301c-tools
-          name: contentmigration-service:dev
diff --git a/openshift/kustomize/services/contentmigration-historic-print/base/kustomization.yaml b/openshift/kustomize/services/contentmigration-historic-print/base/kustomization.yaml
deleted file mode 100644
index 8075511b29..0000000000
--- a/openshift/kustomize/services/contentmigration-historic-print/base/kustomization.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-resources:
-  - config-map.yaml
-  - deploy.yaml
-  - service.yaml
-
-generatorOptions:
-  disableNameSuffixHash: true
diff --git a/openshift/kustomize/services/contentmigration-historic-print/overlays/prod/kustomization.yaml b/openshift/kustomize/services/contentmigration-historic-print/overlays/prod/kustomization.yaml
deleted file mode 100644
index 572e53cb26..0000000000
--- a/openshift/kustomize/services/contentmigration-historic-print/overlays/prod/kustomization.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-namespace: 9b301c-prod
-
-resources:
-  - ../../base
-
-generatorOptions:
-  disableNameSuffixHash: true
-
-patches:
-  - target:
-      kind: ConfigMap
-      name: contentmigration-historic-print-service
-    patch: |-
-      - op: replace
-        path: /data/GENERATE_ALERTS_ON_CONTENT_MIGRATION
-        value: "false"
-  - target:
-      kind: DeploymentConfig
-      name: contentmigration-historic-print-service
-    patch: |-
-      - op: replace
-        path: /spec/replicas
-        value: 1
-      - op: replace
-        path: /spec/template/spec/containers/0/resources/requests/cpu
-        value: 25m
-      - op: replace
-        path: /spec/template/spec/containers/0/resources/requests/memory
-        value: 128Mi
-      - op: replace
-        path: /spec/template/spec/containers/0/resources/limits/cpu
-        value: 150m
-      - op: replace
-        path: /spec/template/spec/containers/0/resources/limits/memory
-        value: 350Mi
-      - op: replace
-        path: /spec/triggers/1/imageChangeParams/from/name
-        value: contentmigration-service:prod
-      - op: replace
-        path: /spec/template/spec/containers/0/env/0/value
-        value: Production
diff --git a/openshift/kustomize/services/contentmigration-historic-print/base/config-map.yaml b/openshift/kustomize/services/contentmigration-historic/base/config-map.yaml
similarity index 77%
rename from openshift/kustomize/services/contentmigration-historic-print/base/config-map.yaml
rename to openshift/kustomize/services/contentmigration-historic/base/config-map.yaml
index c4f3562811..35f7c2701f 100644
--- a/openshift/kustomize/services/contentmigration-historic-print/base/config-map.yaml
+++ b/openshift/kustomize/services/contentmigration-historic/base/config-map.yaml
@@ -3,23 +3,23 @@
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: contentmigration-historic-print-service
+  name: contentmigration-historic-service
   namespace: default
   annotations:
     description: Content Migration HISTORIC service configuration settings
     created-by: jeremy.foster
   labels:
-    name: contentmigration-historic-print-service
+    name: contentmigration-historic-service
     part-of: tno
     version: 1.0.0
-    component: contentmigration-historic-print-service
+    component: contentmigration-historic-service
     managed-by: kustomize
 data:
   MAX_FAIL_LIMIT: "5"
   VOLUME_PATH: /data
   CONTENT_MIGRATION_MEDIA_HOST_ROOT_URI: "https://tno.gov.bc.ca/av"
   # Filter per instance
-  INGEST_TYPES: "TNO-PrintContent"
+  INGEST_TYPES: "TNO-PrintContent,TNO-Image,TNO-AudioVideo,TNO-Story"
   SUPPORTED_IMPORT_MIGRATION_TYPES: "Historic,All"
   DEFAULT_USERNAME_FOR_AUDIT: "contentmigrator"
   GENERATE_ALERTS_ON_CONTENT_MIGRATION: "true"
diff --git a/openshift/kustomize/services/contentmigration-historic-image/base/deploy.yaml b/openshift/kustomize/services/contentmigration-historic/base/deploy.yaml
similarity index 82%
rename from openshift/kustomize/services/contentmigration-historic-image/base/deploy.yaml
rename to openshift/kustomize/services/contentmigration-historic/base/deploy.yaml
index 7723e59cdb..fa5af1ace6 100644
--- a/openshift/kustomize/services/contentmigration-historic-image/base/deploy.yaml
+++ b/openshift/kustomize/services/contentmigration-historic/base/deploy.yaml
@@ -3,23 +3,23 @@
 kind: DeploymentConfig
 apiVersion: apps.openshift.io/v1
 metadata:
-  name: contentmigration-historic-image-service
+  name: contentmigration-historic-service
   namespace: default
   annotations:
-    description: Defines how to deploy contentmigration-historic-image-service
+    description: Defines how to deploy contentmigration-historic-service
     created-by: jeremy.foster
   labels:
-    name: contentmigration-historic-image-service
+    name: contentmigration-historic-service
     part-of: tno
     version: 1.0.0
-    component: contentmigration-historic-image-service
+    component: contentmigration-historic-service
     managed-by: kustomize
 spec:
   replicas: 1
   selector:
-    name: contentmigration-historic-image-service
+    name: contentmigration-historic-service
     part-of: tno
-    component: contentmigration-historic-image-service
+    component: contentmigration-historic-service
   strategy:
     rollingParams:
       intervalSeconds: 1
@@ -30,18 +30,18 @@ spec:
     type: Rolling
   template:
     metadata:
-      name: contentmigration-historic-image-service
+      name: contentmigration-historic-service
       labels:
-        name: contentmigration-historic-image-service
+        name: contentmigration-historic-service
         part-of: tno
-        component: contentmigration-historic-image-service
+        component: contentmigration-historic-service
     spec:
       volumes:
         - name: ingest-storage
           persistentVolumeClaim:
             claimName: ingest-storage
       containers:
-        - name: contentmigration-historic-image-service
+        - name: contentmigration-historic-service
           image: ""
           imagePullPolicy: Always
           ports:
@@ -100,47 +100,47 @@ spec:
             - name: Service__MaxFailLimit
               valueFrom:
                 configMapKeyRef:
-                  name: contentmigration-historic-image-service
+                  name: contentmigration-historic-service
                   key: MAX_FAIL_LIMIT
             - name: Service__VolumePath
               valueFrom:
                 configMapKeyRef:
-                  name: contentmigration-historic-image-service
+                  name: contentmigration-historic-service
                   key: VOLUME_PATH
             - name: Service__MediaHostRootUri
               valueFrom:
                 configMapKeyRef:
-                  name: contentmigration-historic-image-service
+                  name: contentmigration-historic-service
                   key: CONTENT_MIGRATION_MEDIA_HOST_ROOT_URI
             - name: Service__IngestTypes
               valueFrom:
                 configMapKeyRef:
-                  name: contentmigration-historic-image-service
+                  name: contentmigration-historic-service
                   key: INGEST_TYPES
             - name: Service__SupportedImportMigrationTypes
               valueFrom:
                 configMapKeyRef:
-                  name: contentmigration-historic-image-service
+                  name: contentmigration-historic-service
                   key: SUPPORTED_IMPORT_MIGRATION_TYPES
             - name: Service__DefaultUserNameForAudit
               valueFrom:
                 configMapKeyRef:
-                  name: contentmigration-historic-image-service
+                  name: contentmigration-historic-service
                   key: DEFAULT_USERNAME_FOR_AUDIT
             - name: Service__GenerateAlertsOnContentMigration
               valueFrom:
                 configMapKeyRef:
-                  name: contentmigration-historic-image-service
+                  name: contentmigration-historic-service
                   key: GENERATE_ALERTS_ON_CONTENT_MIGRATION
             - name: Service__DataLocation
               valueFrom:
                 configMapKeyRef:
-                  name: contentmigration-historic-image-service
+                  name: contentmigration-historic-service
                   key: DATA_LOCATION
             - name: Service__MaxRecordsPerRetrieval
               valueFrom:
                 configMapKeyRef:
-                  name: contentmigration-historic-image-service
+                  name: contentmigration-historic-service
                   key: MAX_RECORDS_PER_RETRIEVAL
 
             # CHES Configuration
@@ -152,12 +152,12 @@ spec:
             - name: CHES__EmailEnabled
               valueFrom:
                 configMapKeyRef:
-                  name: contentmigration-historic-image-service
+                  name: contentmigration-historic-service
                   key: CHES_EMAIL_ENABLED
             - name: CHES__EmailAuthorized
               valueFrom:
                 configMapKeyRef:
-                  name: contentmigration-historic-image-service
+                  name: contentmigration-historic-service
                   key: CHES_EMAIL_AUTHORIZED
 
             - name: CHES__AuthUrl
@@ -216,7 +216,7 @@ spec:
       imageChangeParams:
         automatic: true
         containerNames:
-          - contentmigration-historic-image-service
+          - contentmigration-historic-service
         from:
           kind: ImageStreamTag
           namespace: 9b301c-tools
diff --git a/openshift/kustomize/services/contentmigration-historic-audiovideo/base/kustomization.yaml b/openshift/kustomize/services/contentmigration-historic/base/kustomization.yaml
similarity index 100%
rename from openshift/kustomize/services/contentmigration-historic-audiovideo/base/kustomization.yaml
rename to openshift/kustomize/services/contentmigration-historic/base/kustomization.yaml
diff --git a/openshift/kustomize/services/contentmigration-historic-print/base/service.yaml b/openshift/kustomize/services/contentmigration-historic/base/service.yaml
similarity index 68%
rename from openshift/kustomize/services/contentmigration-historic-print/base/service.yaml
rename to openshift/kustomize/services/contentmigration-historic/base/service.yaml
index babde1129c..6cb3dc7df0 100644
--- a/openshift/kustomize/services/contentmigration-historic-print/base/service.yaml
+++ b/openshift/kustomize/services/contentmigration-historic/base/service.yaml
@@ -3,16 +3,16 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: contentmigration-historic-print-service
+  name: contentmigration-historic-service
   namespace: default
   annotations:
     description: Exposes and load balances the application pods.
     created-by: jeremy.foster
   labels:
-    name: contentmigration-historic-print-service
+    name: contentmigration-historic-service
     part-of: tno
     version: 1.0.0
-    component: contentmigration-historic-print-service
+    component: contentmigration-historic-service
     managed-by: kustomize
 spec:
   ports:
@@ -22,6 +22,6 @@ spec:
       targetPort: 8080
   selector:
     part-of: tno
-    component: contentmigration-historic-print-service
+    component: contentmigration-historic-service
   sessionAffinity: None
   type: ClusterIP
diff --git a/openshift/kustomize/services/contentmigration-historic-print/overlays/dev/kustomization.yaml b/openshift/kustomize/services/contentmigration-historic/overlays/dev/kustomization.yaml
similarity index 94%
rename from openshift/kustomize/services/contentmigration-historic-print/overlays/dev/kustomization.yaml
rename to openshift/kustomize/services/contentmigration-historic/overlays/dev/kustomization.yaml
index 2d9af529e4..7e247eace8 100644
--- a/openshift/kustomize/services/contentmigration-historic-print/overlays/dev/kustomization.yaml
+++ b/openshift/kustomize/services/contentmigration-historic/overlays/dev/kustomization.yaml
@@ -12,7 +12,7 @@ generatorOptions:
 patches:
   - target:
       kind: DeploymentConfig
-      name: contentmigration-historic-print-service
+      name: contentmigration-historic-service
     patch: |-
       - op: replace
         path: /spec/replicas
diff --git a/openshift/kustomize/services/contentmigration-historic-image/overlays/prod/kustomization.yaml b/openshift/kustomize/services/contentmigration-historic/overlays/prod/kustomization.yaml
similarity index 91%
rename from openshift/kustomize/services/contentmigration-historic-image/overlays/prod/kustomization.yaml
rename to openshift/kustomize/services/contentmigration-historic/overlays/prod/kustomization.yaml
index 49589a1e3f..bc8b338375 100644
--- a/openshift/kustomize/services/contentmigration-historic-image/overlays/prod/kustomization.yaml
+++ b/openshift/kustomize/services/contentmigration-historic/overlays/prod/kustomization.yaml
@@ -12,14 +12,14 @@ generatorOptions:
 patches:
   - target:
       kind: ConfigMap
-      name: contentmigration-historic-image-service
+      name: contentmigration-historic-service
     patch: |-
       - op: replace
         path: /data/GENERATE_ALERTS_ON_CONTENT_MIGRATION
         value: "false"
   - target:
       kind: DeploymentConfig
-      name: contentmigration-historic-image-service
+      name: contentmigration-historic-service
     patch: |-
       - op: replace
         path: /spec/replicas
diff --git a/openshift/kustomize/services/contentmigration-historic-print/overlays/test/kustomization.yaml b/openshift/kustomize/services/contentmigration-historic/overlays/test/kustomization.yaml
similarity index 91%
rename from openshift/kustomize/services/contentmigration-historic-print/overlays/test/kustomization.yaml
rename to openshift/kustomize/services/contentmigration-historic/overlays/test/kustomization.yaml
index 2364511aa0..247de7a01a 100644
--- a/openshift/kustomize/services/contentmigration-historic-print/overlays/test/kustomization.yaml
+++ b/openshift/kustomize/services/contentmigration-historic/overlays/test/kustomization.yaml
@@ -12,14 +12,14 @@ generatorOptions:
 patches:
   - target:
       kind: ConfigMap
-      name: contentmigration-historic-print-service
+      name: contentmigration-historic-service
     patch: |-
       - op: replace
         path: /data/GENERATE_ALERTS_ON_CONTENT_MIGRATION
         value: "false"
   - target:
       kind: DeploymentConfig
-      name: contentmigration-historic-print-service
+      name: contentmigration-historic-service
     patch: |-
       - op: replace
         path: /spec/replicas
diff --git a/openshift/scripts/deploy.sh b/openshift/scripts/deploy.sh
index c5dc1d17bb..c8682b210c 100755
--- a/openshift/scripts/deploy.sh
+++ b/openshift/scripts/deploy.sh
@@ -35,16 +35,8 @@ podsFileMonitor=$(getPods filemonitor-service dc $env)
 podsSyndication=$(getPods syndication-service dc $env)
 podsImage=$(getPods image-service dc $env)
 
-if [ $env = "prod" ]; then
-  podsContentMigration=$(getPods contentmigration-service dc $env)
-  podsContentMigrationHistoricAudioVideo=$(getPods contentmigration-historic-audiovideo-service dc $env)
-  podsContentMigrationHistoricImage=$(getPods contentmigration-historic-image-service dc $env)
-  podsContentMigrationHistoricOnline=$(getPods contentmigration-historic-online-service dc $env)
-  podsContentMigrationHistoricPrint=$(getPods contentmigration-historic-print-service dc $env)
-else
-  podsContentMigration=$(getPods contentmigration-service dc $env)
-  podsContentMigrationHistoric=$(getPods contentmigration-historic-service dc $env)
-fi
+podsContentMigration=$(getPods contentmigration-service dc $env)
+podsContentMigrationHistoric=$(getPods contentmigration-historic-service dc $env)
 
 podsIndexing=$(getPods indexing-service dc $env)
 podsContent=$(getPods content-service dc $env)
@@ -116,16 +108,8 @@ scale editor $podsEditor dc $env
 scale subscriber $podsSubscriber dc $env
 
 # scale capture-service $podsCapture dc $env
-if [ $env = "prod" ]; then
-  scale contentmigration-service $podsContentMigration dc $env
-  scale contentmigration-historic-audiovideo-service $podsContentMigrationHistoricAudioVideo dc $env
-  scale contentmigration-historic-image-service $podsContentMigrationHistoricImage dc $env
-  scale contentmigration-historic-online-service $podsContentMigrationHistoricOnline dc $env
-  scale contentmigration-historic-print-service $podsContentMigrationHistoricPrint dc $env
-else
-  scale contentmigration-service $podsContentMigration dc $env
-  scale contentmigration-historic-service $podsContentMigrationHistoric dc $env
-fi
+scale contentmigration-service $podsContentMigration dc $env
+scale contentmigration-historic-service $podsContentMigrationHistoric dc $env
 
 scale filemonitor-service $podsFileMonitor dc $env
 scale syndication-service $podsSyndication dc $env