diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ab763cd1..6880f226 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,11 @@ variables:
   BUILD_BASED_IMAGE_CENTOS7: "git.mesalab.cn:7443/mesa_platform/build-env:master"
   BUILD_BASED_IMAGE_ROCKYLINUX8: "git.mesalab.cn:7443/mesa_platform/build-env:rockylinux-dindind"
 
+stages:
+  - build
+  - merge_build
+  - deploy
+
 .build_tsg-buildimage:
   script:
     - env | sort
@@ -14,6 +19,27 @@ variables:
   tags:
     - tsg-os-installer
 
+.build_tsg-buildimage-p0906:
+  script:
+    - env | sort
+    - yum -y install pbzip2 ansible
+    - make DALIY_BUILD_VERSION=$DALIY_BUILD_VERSION
+    - chmod +x ./tools/upload.sh
+    - ./tools/upload.sh 
+  tags:
+    - tsg-os-builder-el8
+
+.build_tsg-build-container-images:
+  script:
+    - env | sort
+    - yum -y remove docker-ce
+    - yum -y install pbzip2 ansible buildah podman
+    - make DALIY_BUILD_VERSION=$DALIY_BUILD_VERSION
+    - chmod +x ./tools/upload.sh
+    - ./tools/upload.sh 
+  tags:
+    - tsg-os-builder-el8
+
 .build_tsg_vm_image:
   cache:
     key: $BUILD_OS_CACHE_KEY
@@ -41,7 +67,7 @@ variables:
     - ./tools/upload.sh
     - rm -rf images/*
   tags:
-    - tsg-os-installer
+    - tsg-os-builder-el8
 
 feature_branch_build_7400_mcn0:
   image: $BUILD_BASED_IMAGE_CENTOS7
@@ -108,10 +134,29 @@ feature_branch_build_9000:
 #     - /^rel-.*$/i
 #     - /^update-.*$/i
 
-feature_branch_build_TSGXP0906:
+feature_branch_build_container_images_TSGXP0906:
   image: $BUILD_BASED_IMAGE_ROCKYLINUX8
   stage: build
-  extends: .build_tsg-buildimage
+  extends: .build_tsg-build-container-images
+  variables:
+    PROFILE_LIST: TSGXBUILDCONTAINERP0906
+    DALIY_BUILD_VERSION: 1
+  cache:
+    key: $CI_COMMIT_REF_SLUG-TSGXP0906
+    paths:
+      - images/
+    policy: push
+  except:
+    - tags
+    - /^dev-.*$/i
+    - /^rel-.*$/i
+    - /^update-.*$/i
+
+feature_branch_build_TSGXP0906:
+  image: $BUILD_BASED_IMAGE_ROCKYLINUX8
+  stage: merge_build
+  extends: .build_tsg-buildimage-p0906
+  needs: ["feature_branch_build_container_images_TSGXP0906"]
   variables:
     PROFILE_LIST: TSGXNXR620G40R01P0906
     DALIY_BUILD_VERSION: 1
@@ -119,7 +164,6 @@ feature_branch_build_TSGXP0906:
     key: $CI_COMMIT_REF_SLUG-TSGXP0906
     paths:
       - images/
-    policy: push
   except:
     - tags
     - /^dev-.*$/i
@@ -237,10 +281,30 @@ develop_build_9000:
 #   only:
 #     - /^dev-.*$/i
 
-develop_build_TSGXP0906:
+develop_build_container_images_TSGXP0906:
   image: $BUILD_BASED_IMAGE_ROCKYLINUX8
   stage: build
-  extends: .build_tsg-buildimage
+  extends: .build_tsg-build-container-images
+  variables:
+    PROFILE_LIST: TSGXBUILDCONTAINERP0906
+    UPLOAD_TO_FILE_REPO: 1
+    PULP3_FILE_REPO_NAME: tsg-os-images-develop
+    PULP3_FILE_DIST_NAME: tsg-os-images-develop
+    DALIY_BUILD_VERSION: 1
+    FILE_REPO_PATH: install/develop/tsg-os-images
+  cache:
+    key: $CI_COMMIT_REF_SLUG-TSGXP0906
+    paths:
+      - images/
+    policy: push
+  only:
+    - /^dev-.*$/i
+
+develop_build_TSGXP0906:
+  image: $BUILD_BASED_IMAGE_ROCKYLINUX8
+  stage: merge_build
+  extends: .build_tsg-buildimage-p0906
+  needs: ["develop_build_container_images_TSGXP0906"]
   variables:
     PROFILE_LIST: TSGXNXR620G40R01P0906
     UPLOAD_TO_FILE_REPO: 1
@@ -252,7 +316,6 @@ develop_build_TSGXP0906:
     key: $CI_COMMIT_REF_SLUG-TSGXP0906
     paths:
       - images/
-    policy: push
   only:
     - /^dev-.*$/i
 
@@ -371,10 +434,30 @@ testing_build_9000:
 #   only:
 #     - /^rel-.*$/i
 
-testing_build_TSGXP0906:
+testing_build_container_images_TSGXP0906:
   image: $BUILD_BASED_IMAGE_ROCKYLINUX8
   stage: build
-  extends: .build_tsg-buildimage
+  extends: .build_tsg-build-container-images
+  variables:
+    PROFILE_LIST: TSGXBUILDCONTAINERP0906
+    UPLOAD_TO_FILE_REPO: 1
+    PULP3_FILE_REPO_NAME: tsg-os-images-testing
+    PULP3_FILE_DIST_NAME: tsg-os-images-testing
+    FILE_REPO_PATH: install/testing/tsg-os-images
+    DALIY_BUILD_VERSION: 1
+  cache:
+    key: $CI_COMMIT_REF_SLUG-TSGXP0906
+    paths:
+      - images/
+    policy: push
+  only:
+    - /^rel-.*$/i
+
+testing_build_TSGXP0906:
+  image: $BUILD_BASED_IMAGE_ROCKYLINUX8
+  stage: merge_build
+  needs: ["testing_build_container_images_TSGXP0906"]
+  extends: .build_tsg-buildimage-p0906
   variables:
     PROFILE_LIST: TSGXNXR620G40R01P0906
     UPLOAD_TO_FILE_REPO: 1
@@ -386,7 +469,6 @@ testing_build_TSGXP0906:
     key: $CI_COMMIT_REF_SLUG-TSGXP0906
     paths:
       - images/
-    policy: push
   only:
     - /^rel-.*$/i
 
@@ -505,10 +587,30 @@ rc_build_9000:
 #   only:
 #     - /^.*-rc.*$/i
 
-rc_build_TSGXP0906:
+rc_build_container_images_TSGXP0906:
   image: $BUILD_BASED_IMAGE_ROCKYLINUX8
   stage: build
-  extends: .build_tsg-buildimage
+  extends: .build_tsg-build-container-images
+  variables:
+    PROFILE_LIST: TSGXBUILDCONTAINERP0906
+    UPLOAD_TO_FILE_REPO: 1
+    DALIY_BUILD_VERSION: 0
+    PULP3_FILE_REPO_NAME: tsg-os-images-rc
+    PULP3_FILE_DIST_NAME: tsg-os-images-rc
+    FILE_REPO_PATH: install/rc/tsg-os-images
+  cache:
+    key: $CI_COMMIT_REF_SLUG-TSGXP0906
+    paths:
+      - images/
+    policy: push
+  only:
+    - /^.*-rc.*$/i
+
+rc_build_TSGXP0906:
+  image: $BUILD_BASED_IMAGE_ROCKYLINUX8
+  stage: merge_build
+  extends: .build_tsg-buildimage-p0906
+  needs: ["rc_build_container_images_TSGXP0906"]
   variables:
     PROFILE_LIST: TSGXNXR620G40R01P0906
     UPLOAD_TO_FILE_REPO: 1
@@ -520,7 +622,6 @@ rc_build_TSGXP0906:
     key: $CI_COMMIT_REF_SLUG-TSGXP0906
     paths:
       - images/
-    policy: push
   only:
     - /^.*-rc.*$/i
 
@@ -649,10 +750,32 @@ release_build_9000:
 #   except:
 #     - /^.*-rc.*$/i
 
-release_build_TSGXP0906:
+release_build_container_images_TSGXP0906:
   image: $BUILD_BASED_IMAGE_ROCKYLINUX8
   stage: build
-  extends: .build_tsg-buildimage
+  extends: .build_tsg-build-container-images
+  variables:
+    PROFILE_LIST: TSGXBUILDCONTAINERP0906
+    UPLOAD_TO_FILE_REPO: 1
+    DALIY_BUILD_VERSION: 0
+    PULP3_FILE_REPO_NAME: tsg-os-images-release
+    PULP3_FILE_DIST_NAME: tsg-os-images-release
+    FILE_REPO_PATH: install/release/tsg-os-images
+  cache:
+    key: $CI_COMMIT_REF_SLUG-TSGXP0906
+    paths:
+      - images/
+    policy: push
+  only:
+    - tags
+  except:
+    - /^.*-rc.*$/i
+
+release_build_TSGXP0906:
+  image: $BUILD_BASED_IMAGE_ROCKYLINUX8
+  stage: merge_build
+  extends: .build_tsg-buildimage-p0906
+  needs: ["release_build_container_images_TSGXP0906"]
   variables:
     PROFILE_LIST: TSGXNXR620G40R01P0906
     UPLOAD_TO_FILE_REPO: 1
@@ -664,7 +787,6 @@ release_build_TSGXP0906:
     key: $CI_COMMIT_REF_SLUG-TSGXP0906
     paths:
       - images/
-    policy: push
   only:
     - tags
   except:
diff --git a/ansible/HAL_deploy.yml b/ansible/HAL_deploy.yml
index 979ea867..e351bdf0 100644
--- a/ansible/HAL_deploy.yml
+++ b/ansible/HAL_deploy.yml
@@ -185,9 +185,7 @@
     - install_config/group_vars/HAL_TSGXNXR620G40R01P0906.yml
     - install_config/group_vars/rpm_version.yml
   roles:
-    - {role: container-tools-install, tags: container-tools-install}
     - {role: framework, tags: framework}
-    - {role: mrzcpd, tags: mrzcpd}
     - {role: sapp, tags: sapp}
     - {role: tsg_master, tags: tsg_master}
     - {role: kni, tags: kni}
@@ -204,7 +202,6 @@
     - install_config/group_vars/HAL_TSGXNXR620G40R01P0906.yml
     - install_config/group_vars/rpm_version.yml
   roles:
-    - {role: container-tools-install, tags: container-tools-install}
     - {role: framework, tags: framework}
     - {role: mrzcpd, tags: mrzcpd}
     - {role: tfe, tags: tfe}
@@ -216,7 +213,6 @@
     - install_config/group_vars/HAL_TSGXNXR620G40R01P0906.yml
     - install_config/group_vars/rpm_version.yml
   roles:
-    - {role: container-tools-install, tags: container-tools-install}
     - {role: framework, tags: framework}
     - {role: redis, tags: redis}
     - {role: certstore, tags: certstore}
@@ -227,7 +223,6 @@
     - install_config/group_vars/HAL_TSGXNXR620G40R01P0906.yml
     - install_config/group_vars/rpm_version.yml
   roles:
-    - {role: container-tools-install, tags: container-tools-install}
     - {role: telegraf_statistic, tags: telegraf_statistic}
 
 - hosts: TSG-X-NXR620G40-R01-P0906-sce
@@ -236,9 +231,7 @@
     - install_config/group_vars/HAL_TSGXNXR620G40R01P0906.yml
     - install_config/group_vars/rpm_version.yml
   roles:
-    - {role: container-tools-install, tags: container-tools-install}
     - {role: framework, tags: framework}
-    - {role: mrzcpd, tags: mrzcpd}
     - {role: sce, tags: sce}
     - {role: hasp, tags: hasp}
 
@@ -248,7 +241,6 @@
     - install_config/group_vars/HAL_TSGXNXR620G40R01P0906.yml
     - install_config/group_vars/rpm_version.yml
   roles:
-    - {role: container-tools-install, tags: container-tools-install}
     - {role: framework, tags: framework}
     - {role: bfdd, tags: bfdd}
 
@@ -258,9 +250,7 @@
     - install_config/group_vars/HAL_TSGXNXR620G40R01P0906.yml
     - install_config/group_vars/rpm_version.yml
   roles:
-    - {role: container-tools-install, tags: container-tools-install}
     - {role: framework, tags: framework}
-    - {role: mrzcpd, tags: mrzcpd}
     - {role: shaping_engine, tags: shaping_engine}
 
 - hosts: server
@@ -269,3 +259,11 @@
     - install_config/group_vars/rpm_version.yml
   roles:
     - {role: rpm_download, tags: rpm_download}
+
+- hosts: TSG-X-NXR620G40-R01-P0906-tools
+  remote_user: root
+  vars_files:
+    - install_config/group_vars/HAL_TSGXNXR620G40R01P0906.yml
+    - install_config/group_vars/rpm_version.yml
+  roles:
+    - {role: container-tools-install, tags: container-tools-install}
diff --git a/ansible/roles/traffic-engine/files/helm/templates/_config.tpl b/ansible/roles/traffic-engine/files/helm/templates/_config.tpl
index 2574a8da..c6ee162b 100644
--- a/ansible/roles/traffic-engine/files/helm/templates/_config.tpl
+++ b/ansible/roles/traffic-engine/files/helm/templates/_config.tpl
@@ -424,6 +424,18 @@ enable_breakpad_upload=0
       - name: root-sys
         hostPath:
           path: /root/sys
+      - name: profile-mrzcpd
+        hostPath:
+          path: /etc/profile.d/mrzcpd.sh
+          type: File
+      - name: ldconfig-mrzcpd
+        hostPath:
+          path: /etc/ld.so.conf.d/mrzcpd.conf
+          type: File
+      - name: sysconfig-mrzcpd
+        hostPath:
+          path: /etc/sysconfig/mrzcpd
+          type: File
 {{- end -}}
 
 {{- define "traffic-engine.mount.mrzcpd" -}}
@@ -439,6 +451,16 @@ enable_breakpad_upload=0
         - name: root-sys
           mountPath: /root/sys
           readOnly: false
+        - name: profile-mrzcpd
+          mountPath: /etc/profile.d/mrzcpd.sh
+          readOnly: true
+        - name: ldconfig-mrzcpd
+          mountPath: /etc/ld.so.conf.d/mrzcpd.conf
+          readOnly: true
+        - name: sysconfig-mrzcpd
+          mountPath: /etc/sysconfig/mrzcpd
+          readOnly: true
+
 {{- end -}}
 
 {{- define "traffic-engine.volume.localtime" -}}
diff --git a/ansible/roles/traffic-engine/files/helm/templates/deployment-firewall.yaml b/ansible/roles/traffic-engine/files/helm/templates/deployment-firewall.yaml
index 6e644917..f7f4c94d 100644
--- a/ansible/roles/traffic-engine/files/helm/templates/deployment-firewall.yaml
+++ b/ansible/roles/traffic-engine/files/helm/templates/deployment-firewall.yaml
@@ -35,7 +35,7 @@ spec:
         effect: NoSchedule
       containers:
       - name: firewall
-        image: "docker.io/library/tsg-firewall:{{ .Chart.AppVersion }}"
+        image: "registry.gdnt-cloud.website/tsg-firewall:{{ .Chart.AppVersion }}"
         imagePullPolicy: Never
         workingDir: /opt/tsg/sapp
         command:
@@ -90,7 +90,7 @@ spec:
         {{ template "traffic-engine.firewall.mount.hostpath" . }}
 
       - name: telegraf
-        image: "docker.io/library/tsg-telegraf:{{ .Chart.AppVersion }}"
+        image: "registry.gdnt-cloud.website/tsg-telegraf:{{ .Chart.AppVersion }}"
         imagePullPolicy: Never
         command: ["/usr/bin/telegraf", "-config", "/etc/telegraf/telegraf_statistic.conf", "-config-directory", "/etc/telegraf/telegraf_statistic.d"]
         securityContext:
@@ -108,7 +108,7 @@ spec:
         {{ template "traffic-engine.mount.localtime" . }}
 
       - name: telegraf-security
-        image: "docker.io/library/tsg-telegraf:{{ .Chart.AppVersion }}"
+        image: "registry.gdnt-cloud.website/tsg-telegraf:{{ .Chart.AppVersion }}"
         imagePullPolicy: Never
         command: ["/usr/bin/telegraf", "-config", "/etc/telegraf/telegraf_security.conf", "-config-directory", "/etc/telegraf/telegraf_statistic.d"]
         securityContext:
@@ -127,7 +127,7 @@ spec:
 
       initContainers:
       - name: firewall-init
-        image: "docker.io/library/tsg-init:{{ .Chart.AppVersion }}"
+        image: "registry.gdnt-cloud.website/tsg-init:{{ .Chart.AppVersion }}"
         imagePullPolicy: Never
         command:
           - "bash"
diff --git a/ansible/roles/traffic-engine/files/helm/templates/deployment-proxy.yaml b/ansible/roles/traffic-engine/files/helm/templates/deployment-proxy.yaml
index ba206d47..f3b00aa7 100644
--- a/ansible/roles/traffic-engine/files/helm/templates/deployment-proxy.yaml
+++ b/ansible/roles/traffic-engine/files/helm/templates/deployment-proxy.yaml
@@ -36,7 +36,7 @@ spec:
         effect: NoSchedule
       containers:
       - name: proxy
-        image: "docker.io/library/tsg-proxy:{{ .Chart.AppVersion }}"
+        image: "registry.gdnt-cloud.website/tsg-proxy:{{ .Chart.AppVersion }}"
         imagePullPolicy: Never
         workingDir: /opt/tsg/tfe
         command:
@@ -87,7 +87,7 @@ spec:
         {{ template "traffic-engine.proxy.mount.hostpath" . }}
 
       - name: certstore
-        image: "docker.io/library/tsg-certstore:{{ .Chart.AppVersion }}"
+        image: "registry.gdnt-cloud.website/tsg-certstore:{{ .Chart.AppVersion }}"
         imagePullPolicy: Never
         workingDir: /opt/tsg/certstore
         command:
@@ -116,7 +116,7 @@ spec:
           mountPath: /etc/traffic-engine/hotfix/certstore
 
       - name: cert-redis
-        image: "docker.io/library/tsg-certstore:{{ .Chart.AppVersion }}"
+        image: "registry.gdnt-cloud.website/tsg-certstore:{{ .Chart.AppVersion }}"
         imagePullPolicy: Never
         command: ["/usr/bin/redis-server", "/etc/cert-redis.conf"]
         securityContext:
@@ -126,7 +126,7 @@ spec:
 
       initContainers:
       - name: proxy-init
-        image: "docker.io/library/tsg-init:{{ .Chart.AppVersion }}"
+        image: "registry.gdnt-cloud.website/tsg-init:{{ .Chart.AppVersion }}"
         imagePullPolicy: Never
         command:
           - "bash"
diff --git a/ansible/roles/traffic-engine/files/helm/templates/deployment-service-chaining.yaml b/ansible/roles/traffic-engine/files/helm/templates/deployment-service-chaining.yaml
index 653e0e8f..6d62b4bb 100644
--- a/ansible/roles/traffic-engine/files/helm/templates/deployment-service-chaining.yaml
+++ b/ansible/roles/traffic-engine/files/helm/templates/deployment-service-chaining.yaml
@@ -36,7 +36,7 @@ spec:
         effect: NoSchedule
       containers:
       - name: telegraf-sce
-        image: "docker.io/library/tsg-telegraf:{{ .Chart.AppVersion }}"
+        image: "registry.gdnt-cloud.website/tsg-telegraf:{{ .Chart.AppVersion }}"
         imagePullPolicy: Never
         command: ["/usr/bin/telegraf", "-config", "/etc/telegraf/telegraf_sce.conf", "-config-directory", "/etc/telegraf/telegraf_statistic.d"]
         securityContext:
@@ -54,7 +54,7 @@ spec:
         {{ template "traffic-engine.mount.localtime" . }}
 
       - name: sce
-        image: "docker.io/library/tsg-sce:{{ .Chart.AppVersion }}"
+        image: "registry.gdnt-cloud.website/tsg-sce:{{ .Chart.AppVersion }}"
         imagePullPolicy: Never
         workingDir: /opt/tsg/sce
         command:
@@ -107,7 +107,7 @@ spec:
         {{ template "traffic-engine.service-chaining.mount.hostpath" . }}
 
       - name: bfdd
-        image: "docker.io/library/tsg-bfdd:{{ .Chart.AppVersion }}"
+        image: "registry.gdnt-cloud.website/tsg-bfdd:{{ .Chart.AppVersion }}"
         imagePullPolicy: Never
         workingDir: /opt/tsg/bfdd
         command:
@@ -143,7 +143,7 @@ spec:
 
       initContainers:
       - name: service-chaining-init
-        image: "docker.io/library/tsg-init:{{ .Chart.AppVersion }}"
+        image: "registry.gdnt-cloud.website/tsg-init:{{ .Chart.AppVersion }}"
         imagePullPolicy: Never
         command:
           - "bash"
diff --git a/ansible/roles/traffic-engine/files/helm/templates/deployment-shaping.yaml b/ansible/roles/traffic-engine/files/helm/templates/deployment-shaping.yaml
index 699f8835..3f8d4029 100644
--- a/ansible/roles/traffic-engine/files/helm/templates/deployment-shaping.yaml
+++ b/ansible/roles/traffic-engine/files/helm/templates/deployment-shaping.yaml
@@ -36,7 +36,7 @@ spec:
         effect: NoSchedule
       containers:
       - name: shaping
-        image: "docker.io/library/tsg-shaping:{{ .Chart.AppVersion }}"
+        image: "registry.gdnt-cloud.website/tsg-shaping:{{ .Chart.AppVersion }}"
         imagePullPolicy: Never
         workingDir: /opt/tsg/shaping_engine
         command:
@@ -97,7 +97,7 @@ spec:
         {{ template "traffic-engine.shaping.mount.hostpath" . }}        
 
       - name: telegraf-shaping
-        image: "docker.io/library/tsg-telegraf:{{ .Chart.AppVersion }}"
+        image: "registry.gdnt-cloud.website/tsg-telegraf:{{ .Chart.AppVersion }}"
         imagePullPolicy: Never
         command: ["/usr/bin/telegraf", "-config", "/etc/telegraf/telegraf_shaping.conf", "-config-directory", "/etc/telegraf/telegraf_statistic.d"]
         securityContext:
@@ -116,7 +116,7 @@ spec:
 
       initContainers:
       - name: shaping-init
-        image: "docker.io/library/tsg-init:{{ .Chart.AppVersion }}"
+        image: "registry.gdnt-cloud.website/tsg-init:{{ .Chart.AppVersion }}"
         imagePullPolicy: Never
         command:
           - "bash"
diff --git a/make/Makefile.TSGXBUILDCONTAINERP0906 b/make/Makefile.TSGXBUILDCONTAINERP0906
new file mode 100644
index 00000000..5c129b41
--- /dev/null
+++ b/make/Makefile.TSGXBUILDCONTAINERP0906
@@ -0,0 +1,163 @@
+
+PROFILE_ID 				:= TSG-X-NXR620G40-R01-P0906
+
+PROFILE_ID_IN_SHORT		:= $(subst -,$e,$(PROFILE_ID))
+CONTAINER_IMAGES_PKG	:= tsg-os-${OS_RELEASE_VER}-${PROFILE_ID_IN_SHORT}-container-images.tar.bz2
+
+TARGET_SYSROOT_DIR		:= $(TARGET_BUILD_DIR)/sysroot
+
+
+TARGET_CONTAINER_IMAGE_TAR_DIR		:= $(TARGET_BUILD_DIR)/container_images/tar
+TOOLS_INSTALL_IMAGE_NAME_TAG		:= 8-base-tools-installed-${OS_RELEASE_VER}
+TOOLS_INSTALL_CONTAINER_NAME		:= rockylinux-8-base-tools-install-${OS_RELEASE_VER}
+TOOLS_COMPONENT_NAME				:= tools
+
+FIREWALL_COMPONENT_NAME				:= firewall
+FIREWALL_INSTALL_CONTAINER_NAME		:= tsg-$(FIREWALL_COMPONENT_NAME)-install-${OS_RELEASE_VER}
+
+PROXY_COMPONENT_NAME				:= proxy
+PROXY_INSTALL_CONTAINER_NAME		:= tsg-$(PROXY_COMPONENT_NAME)-install-${OS_RELEASE_VER}
+
+CERTSTORE_COMPONENT_NAME			:= certstore
+CERTSTORE_INSTALL_CONTAINER_NAME	:= tsg-$(CERTSTORE_COMPONENT_NAME)-install-${OS_RELEASE_VER}
+
+TELEGRAF_COMPONENT_NAME				:= telegraf
+TELEGRAF_INSTALL_CONTAINER_NAME		:= tsg-$(TELEGRAF_COMPONENT_NAME)-install-${OS_RELEASE_VER}
+
+INIT_COMPONENT_NAME					:= init
+INIT_INSTALL_CONTAINER_NAME			:= tsg-$(INIT_COMPONENT_NAME)-install-${OS_RELEASE_VER}
+
+SCE_COMPONENT_NAME					:= sce
+SCE_INSTALL_CONTAINER_NAME			:= tsg-$(SCE_COMPONENT_NAME)-install-${OS_RELEASE_VER}
+
+BFDD_COMPONENT_NAME					:= bfdd
+BFDD_INSTALL_CONTAINER_NAME			:= tsg-$(BFDD_COMPONENT_NAME)-install-${OS_RELEASE_VER}
+
+
+SHAPING_COMPONENT_NAME				:= shaping
+SHAPING_INSTALL_CONTAINER_NAME		:= tsg-$(SHAPING_COMPONENT_NAME)-install-${OS_RELEASE_VER}
+
+
+TRAFFIC_ENGINE_IMAGES_TAR			:= tsg-traffic-engine-${OS_RELEASE_VER}-docker.tar
+
+CONTAINER_IMAGE_REPO_PREFIX			:= registry.gdnt-cloud.website
+
+.PHONY: all builddir installer container-tar container-images-generate clean
+
+all: container-tar
+
+builddir:
+	mkdir -p $(TARGET_CONTAINER_IMAGE_TAR_DIR)
+
+installer: builddir
+	sed -i '/sapp-pr:/d;/tfe-pr:/d;/mrzcpd:/d' $(PROJECTDIR)/ansible/install_config/group_vars/rpm_version.yml
+
+container-images-generate: builddir
+	buildah pull rockylinux:8
+	buildah from --name $(TOOLS_INSTALL_CONTAINER_NAME) rockylinux:8
+	buildah copy $(TOOLS_INSTALL_CONTAINER_NAME) $(CONFDIR)/yum-RockyLinux-8.conf /tmp/
+	buildah copy $(TOOLS_INSTALL_CONTAINER_NAME) /etc/hosts /tmp/
+	buildah run  $(TOOLS_INSTALL_CONTAINER_NAME) -- bash -c "cp /etc/hosts /tmp/hosts.bak;cp /tmp/hosts /etc/hosts"
+	$(TOOLSDIR)/ansible-HAL-CONTAINER $(PROFILE_ID)-$(TOOLS_COMPONENT_NAME)     $(PROJECTDIR) /tmp/empty/container /tmp/yum-RockyLinux-8.conf $(OS_RELEASE_VER) $(TOOLS_INSTALL_CONTAINER_NAME)
+	buildah run  $(TOOLS_INSTALL_CONTAINER_NAME) -- bash -c "yum clean all -y; yum -c /tmp/yum-RockyLinux-8.conf clean all -y" 
+	buildah run  $(TOOLS_INSTALL_CONTAINER_NAME) -- bash -c "cp /tmp/ks-script-* /; cp /tmp/hosts.bak /etc/hosts; rm -rf /tmp/*; mv /ks-script-* /tmp"
+	buildah commit $(TOOLS_INSTALL_CONTAINER_NAME) rockylinux:$(TOOLS_INSTALL_IMAGE_NAME_TAG)
+	buildah rm $(TOOLS_INSTALL_CONTAINER_NAME)
+
+	buildah from --name $(FIREWALL_INSTALL_CONTAINER_NAME) rockylinux:$(TOOLS_INSTALL_IMAGE_NAME_TAG)
+	buildah copy $(FIREWALL_INSTALL_CONTAINER_NAME) $(CONFDIR)/yum-RockyLinux-8.conf /tmp/
+	buildah copy $(FIREWALL_INSTALL_CONTAINER_NAME) /etc/hosts /tmp/
+	buildah run  $(FIREWALL_INSTALL_CONTAINER_NAME) -- bash -c "cp /etc/hosts /tmp/hosts.bak;cp /tmp/hosts /etc/hosts"
+	$(TOOLSDIR)/ansible-HAL-CONTAINER $(PROFILE_ID)-$(FIREWALL_COMPONENT_NAME)  $(PROJECTDIR) /tmp/empty/container /tmp/yum-RockyLinux-8.conf $(OS_RELEASE_VER) $(FIREWALL_INSTALL_CONTAINER_NAME)
+	buildah run  $(FIREWALL_INSTALL_CONTAINER_NAME) -- bash -c "yum clean all -y; yum -c /tmp/yum-RockyLinux-8.conf clean all -y" 
+	buildah run  $(FIREWALL_INSTALL_CONTAINER_NAME) -- bash -c "cp /tmp/ks-script-* /; cp /tmp/hosts.bak /etc/hosts; rm -rf /tmp/*; mv /ks-script-* /tmp"
+	buildah commit $(FIREWALL_INSTALL_CONTAINER_NAME) $(CONTAINER_IMAGE_REPO_PREFIX)/tsg-$(FIREWALL_COMPONENT_NAME):$(OS_RELEASE_VER)
+	buildah rm $(FIREWALL_INSTALL_CONTAINER_NAME)
+	
+	buildah from --name $(PROXY_INSTALL_CONTAINER_NAME) rockylinux:$(TOOLS_INSTALL_IMAGE_NAME_TAG)
+	buildah copy $(PROXY_INSTALL_CONTAINER_NAME) $(CONFDIR)/yum-RockyLinux-8.conf /tmp/
+	buildah copy $(PROXY_INSTALL_CONTAINER_NAME) /etc/hosts /tmp/
+	buildah run  $(PROXY_INSTALL_CONTAINER_NAME) -- bash -c "cp /etc/hosts /tmp/hosts.bak;cp /tmp/hosts /etc/hosts"
+	$(TOOLSDIR)/ansible-HAL-CONTAINER $(PROFILE_ID)-$(PROXY_COMPONENT_NAME)     $(PROJECTDIR) /tmp/empty/container /tmp/yum-RockyLinux-8.conf $(OS_RELEASE_VER) $(PROXY_INSTALL_CONTAINER_NAME)
+	buildah run $(PROXY_INSTALL_CONTAINER_NAME) -- bash -c "cat /etc/sysctl.d/80-tfe.conf" > $(IMAGEDIR_BASE)/80-tfe.conf
+	buildah run $(PROXY_INSTALL_CONTAINER_NAME) -- bash -c "yum clean all -y; yum -c /tmp/yum-RockyLinux-8.conf clean all -y" 
+	buildah run $(PROXY_INSTALL_CONTAINER_NAME) -- bash -c "cp /tmp/ks-script-* /; cp /tmp/hosts.bak /etc/hosts; rm -rf /tmp/*; mv /ks-script-* /tmp"
+	buildah commit $(PROXY_INSTALL_CONTAINER_NAME) $(CONTAINER_IMAGE_REPO_PREFIX)/tsg-$(PROXY_COMPONENT_NAME):$(OS_RELEASE_VER)
+	buildah rm $(PROXY_INSTALL_CONTAINER_NAME)
+
+	buildah from --name $(CERTSTORE_INSTALL_CONTAINER_NAME) rockylinux:$(TOOLS_INSTALL_IMAGE_NAME_TAG)
+	buildah copy $(CERTSTORE_INSTALL_CONTAINER_NAME) $(CONFDIR)/yum-RockyLinux-8.conf /tmp/
+	buildah copy $(CERTSTORE_INSTALL_CONTAINER_NAME) /etc/hosts /tmp/
+	buildah run  $(CERTSTORE_INSTALL_CONTAINER_NAME) -- bash -c "cp /etc/hosts /tmp/hosts.bak;cp /tmp/hosts /etc/hosts"
+	$(TOOLSDIR)/ansible-HAL-CONTAINER $(PROFILE_ID)-$(CERTSTORE_COMPONENT_NAME) $(PROJECTDIR) /tmp/empty/container /tmp/yum-RockyLinux-8.conf $(OS_RELEASE_VER) $(CERTSTORE_INSTALL_CONTAINER_NAME)
+	buildah run $(CERTSTORE_INSTALL_CONTAINER_NAME) -- bash -c "yum clean all -y; yum -c /tmp/yum-RockyLinux-8.conf clean all -y" 
+	buildah run $(CERTSTORE_INSTALL_CONTAINER_NAME) -- bash -c "cp /tmp/ks-script-* /; cp /tmp/hosts.bak /etc/hosts; rm -rf /tmp/*; mv /ks-script-* /tmp"
+	buildah commit $(CERTSTORE_INSTALL_CONTAINER_NAME) $(CONTAINER_IMAGE_REPO_PREFIX)/tsg-$(CERTSTORE_COMPONENT_NAME):$(OS_RELEASE_VER)
+	buildah rm $(CERTSTORE_INSTALL_CONTAINER_NAME)
+
+	buildah from --name $(TELEGRAF_INSTALL_CONTAINER_NAME) rockylinux:$(TOOLS_INSTALL_IMAGE_NAME_TAG)
+	buildah copy $(TELEGRAF_INSTALL_CONTAINER_NAME) $(CONFDIR)/yum-RockyLinux-8.conf /tmp/
+	buildah copy $(TELEGRAF_INSTALL_CONTAINER_NAME) /etc/hosts /tmp/
+	buildah run  $(TELEGRAF_INSTALL_CONTAINER_NAME) -- bash -c "cp /etc/hosts /tmp/hosts.bak;cp /tmp/hosts /etc/hosts"
+	$(TOOLSDIR)/ansible-HAL-CONTAINER $(PROFILE_ID)-$(TELEGRAF_COMPONENT_NAME)  $(PROJECTDIR) /tmp/empty/container /tmp/yum-RockyLinux-8.conf $(OS_RELEASE_VER) $(TELEGRAF_INSTALL_CONTAINER_NAME)
+	buildah run $(TELEGRAF_INSTALL_CONTAINER_NAME) -- bash -c "yum clean all -y; yum -c /tmp/yum-RockyLinux-8.conf clean all -y" 
+	buildah run $(TELEGRAF_INSTALL_CONTAINER_NAME) -- bash -c "cp /tmp/ks-script-* /; cp /tmp/hosts.bak /etc/hosts; rm -rf /tmp/*; mv /ks-script-* /tmp"
+	buildah commit $(TELEGRAF_INSTALL_CONTAINER_NAME) $(CONTAINER_IMAGE_REPO_PREFIX)/tsg-$(TELEGRAF_COMPONENT_NAME):$(OS_RELEASE_VER)
+	buildah rm $(TELEGRAF_INSTALL_CONTAINER_NAME)
+
+	buildah from --name $(INIT_INSTALL_CONTAINER_NAME) rockylinux:$(TOOLS_INSTALL_IMAGE_NAME_TAG)
+	buildah copy $(INIT_INSTALL_CONTAINER_NAME) $(CONFDIR)/yum-RockyLinux-8.conf /tmp/
+	buildah copy $(INIT_INSTALL_CONTAINER_NAME) /etc/hosts /tmp/
+	buildah run  $(INIT_INSTALL_CONTAINER_NAME) -- bash -c "cp /etc/hosts /tmp/hosts.bak;cp /tmp/hosts /etc/hosts"
+	$(TOOLSDIR)/ansible-HAL-CONTAINER $(PROFILE_ID)-$(INIT_COMPONENT_NAME)      $(PROJECTDIR) /tmp/empty/container /tmp/yum-RockyLinux-8.conf $(OS_RELEASE_VER) $(INIT_INSTALL_CONTAINER_NAME)
+	buildah run $(INIT_INSTALL_CONTAINER_NAME) -- bash -c "yum clean all -y; yum -c /tmp/yum-RockyLinux-8.conf clean all -y" 
+	buildah run $(INIT_INSTALL_CONTAINER_NAME) -- bash -c "cp /tmp/ks-script-* /; cp /tmp/hosts.bak /etc/hosts; rm -rf /tmp/*; mv /ks-script-* /tmp"
+	buildah commit $(INIT_INSTALL_CONTAINER_NAME) $(CONTAINER_IMAGE_REPO_PREFIX)/tsg-$(INIT_COMPONENT_NAME):$(OS_RELEASE_VER)
+	buildah rm $(INIT_INSTALL_CONTAINER_NAME)
+
+	buildah from --name $(SCE_INSTALL_CONTAINER_NAME) rockylinux:$(TOOLS_INSTALL_IMAGE_NAME_TAG)
+	buildah copy $(SCE_INSTALL_CONTAINER_NAME) $(CONFDIR)/yum-RockyLinux-8.conf /tmp/
+	buildah copy $(SCE_INSTALL_CONTAINER_NAME) /etc/hosts /tmp/
+	buildah run  $(SCE_INSTALL_CONTAINER_NAME) -- bash -c "cp /etc/hosts /tmp/hosts.bak;cp /tmp/hosts /etc/hosts"
+	$(TOOLSDIR)/ansible-HAL-CONTAINER $(PROFILE_ID)-$(SCE_COMPONENT_NAME)      $(PROJECTDIR) /tmp/empty/container /tmp/yum-RockyLinux-8.conf $(OS_RELEASE_VER) $(SCE_INSTALL_CONTAINER_NAME)
+	buildah run $(SCE_INSTALL_CONTAINER_NAME) -- bash -c "yum clean all -y; yum -c /tmp/yum-RockyLinux-8.conf clean all -y" 
+	buildah run $(SCE_INSTALL_CONTAINER_NAME) -- bash -c "cp /tmp/ks-script-* /; cp /tmp/hosts.bak /etc/hosts; rm -rf /tmp/*; mv /ks-script-* /tmp"
+	buildah commit $(SCE_INSTALL_CONTAINER_NAME) $(CONTAINER_IMAGE_REPO_PREFIX)/tsg-$(SCE_COMPONENT_NAME):$(OS_RELEASE_VER)
+	buildah rm $(SCE_INSTALL_CONTAINER_NAME)
+
+	buildah from --name $(BFDD_INSTALL_CONTAINER_NAME) rockylinux:$(TOOLS_INSTALL_IMAGE_NAME_TAG)
+	buildah copy $(BFDD_INSTALL_CONTAINER_NAME) $(CONFDIR)/yum-RockyLinux-8.conf /tmp/
+	buildah copy $(BFDD_INSTALL_CONTAINER_NAME) /etc/hosts /tmp/
+	buildah run  $(BFDD_INSTALL_CONTAINER_NAME) -- bash -c "cp /etc/hosts /tmp/hosts.bak;cp /tmp/hosts /etc/hosts"
+	$(TOOLSDIR)/ansible-HAL-CONTAINER $(PROFILE_ID)-$(BFDD_COMPONENT_NAME)      $(PROJECTDIR) /tmp/empty/container /tmp/yum-RockyLinux-8.conf $(OS_RELEASE_VER) $(BFDD_INSTALL_CONTAINER_NAME)
+	buildah run $(BFDD_INSTALL_CONTAINER_NAME) -- bash -c "yum clean all -y; yum -c /tmp/yum-RockyLinux-8.conf clean all -y" 
+	buildah run $(BFDD_INSTALL_CONTAINER_NAME) -- bash -c "cp /tmp/ks-script-* /; cp /tmp/hosts.bak /etc/hosts; rm -rf /tmp/*; mv /ks-script-* /tmp"
+	buildah commit $(BFDD_INSTALL_CONTAINER_NAME) $(CONTAINER_IMAGE_REPO_PREFIX)/tsg-$(BFDD_COMPONENT_NAME):$(OS_RELEASE_VER)
+	buildah rm $(BFDD_INSTALL_CONTAINER_NAME)
+
+	buildah from --name $(SHAPING_INSTALL_CONTAINER_NAME) rockylinux:$(TOOLS_INSTALL_IMAGE_NAME_TAG)
+	buildah copy $(SHAPING_INSTALL_CONTAINER_NAME) $(CONFDIR)/yum-RockyLinux-8.conf /tmp/
+	buildah copy $(SHAPING_INSTALL_CONTAINER_NAME) /etc/hosts /tmp/
+	buildah run  $(SHAPING_INSTALL_CONTAINER_NAME) -- bash -c "cp /etc/hosts /tmp/hosts.bak;cp /tmp/hosts /etc/hosts"
+	$(TOOLSDIR)/ansible-HAL-CONTAINER $(PROFILE_ID)-$(SHAPING_COMPONENT_NAME)      $(PROJECTDIR) /tmp/empty/container /tmp/yum-RockyLinux-8.conf $(OS_RELEASE_VER) $(SHAPING_INSTALL_CONTAINER_NAME)
+	buildah run $(SHAPING_INSTALL_CONTAINER_NAME) -- bash -c "yum clean all -y; yum -c /tmp/yum-RockyLinux-8.conf clean all -y" 
+	buildah run $(SHAPING_INSTALL_CONTAINER_NAME) -- bash -c "cp /tmp/ks-script-* /; cp /tmp/hosts.bak /etc/hosts; rm -rf /tmp/*; mv /ks-script-* /tmp"
+	buildah commit $(SHAPING_INSTALL_CONTAINER_NAME) $(CONTAINER_IMAGE_REPO_PREFIX)/tsg-$(SHAPING_COMPONENT_NAME):$(OS_RELEASE_VER)
+	buildah rm $(SHAPING_INSTALL_CONTAINER_NAME)
+
+container-tar: installer container-images-generate
+	podman save -o $(TARGET_CONTAINER_IMAGE_TAR_DIR)/$(TRAFFIC_ENGINE_IMAGES_TAR)  -m \
+					$(CONTAINER_IMAGE_REPO_PREFIX)/tsg-$(FIREWALL_COMPONENT_NAME):$(OS_RELEASE_VER) \
+					$(CONTAINER_IMAGE_REPO_PREFIX)/tsg-$(PROXY_COMPONENT_NAME):$(OS_RELEASE_VER) \
+					$(CONTAINER_IMAGE_REPO_PREFIX)/tsg-$(CERTSTORE_COMPONENT_NAME):$(OS_RELEASE_VER) \
+					$(CONTAINER_IMAGE_REPO_PREFIX)/tsg-$(TELEGRAF_COMPONENT_NAME):$(OS_RELEASE_VER) \
+					$(CONTAINER_IMAGE_REPO_PREFIX)/tsg-$(INIT_COMPONENT_NAME):$(OS_RELEASE_VER) \
+					$(CONTAINER_IMAGE_REPO_PREFIX)/tsg-$(SCE_COMPONENT_NAME):$(OS_RELEASE_VER) \
+					$(CONTAINER_IMAGE_REPO_PREFIX)/tsg-$(BFDD_COMPONENT_NAME):$(OS_RELEASE_VER) \
+					$(CONTAINER_IMAGE_REPO_PREFIX)/tsg-$(SHAPING_COMPONENT_NAME):$(OS_RELEASE_VER)
+	tar --exclude=*~ --exclude-backups --owner=root --group=root -c -C $(TARGET_CONTAINER_IMAGE_TAR_DIR) . | pbzip2 -p9 > $(IMAGEDIR_BASE)/$(CONTAINER_IMAGES_PKG)
+	sha256sum $(IMAGEDIR_BASE)/$(CONTAINER_IMAGES_PKG) | awk '{print $$1}' > $(IMAGEDIR_BASE)/$(CONTAINER_IMAGES_PKG).sha256sum.txt
+
+clean:
+	rm -rf $(TARGET_BUILD_DIR)
+
diff --git a/make/Makefile.TSGXNXR620G40R01P0906 b/make/Makefile.TSGXNXR620G40R01P0906
index 761c7c4a..185e5c16 100644
--- a/make/Makefile.TSGXNXR620G40R01P0906
+++ b/make/Makefile.TSGXNXR620G40R01P0906
@@ -15,51 +15,7 @@ TARGET_BUILD_DIR 		:= $(BUILDDIR_BASE)/$(PROFILE_ID)
 TARGET_INSTALLER_DIR 	:= $(TARGET_BUILD_DIR)/installer
 TARGET_SYSROOT_DIR		:= $(TARGET_BUILD_DIR)/sysroot
 
-TARGET_CONTAINER_IMAGE_DIR		:= $(TARGET_BUILD_DIR)/container_images
-CONTAINER_DOCKERFILE			:= $(TARGET_CONTAINER_IMAGE_DIR)/Dockerfile
-TARGET_CONTAINER_IMAGE_TAR_DIR	:= $(TARGET_BUILD_DIR)/container_images/tar
-
-CONTAINER_FIREWALL_NAME					:= firewall
-TARGET_CONTAINER_FIREWALL_SYSROOT_DIR	:= $(TARGET_BUILD_DIR)/$(CONTAINER_FIREWALL_NAME)-container_sysroot
-CONTAINER_FIREWALL_PKG					:= tsg-$(CONTAINER_FIREWALL_NAME)-${OS_RELEASE_VER}-${PROFILE_ID_IN_SHORT}-docker.tar.xz
-CONTAINER_FIREWALL_TAR					:= tsg-$(CONTAINER_FIREWALL_NAME)-${OS_RELEASE_VER}-docker.tar
-
-CONTAINER_PROXY_NAME					:= proxy
-TARGET_CONTAINER_RPOXY_SYSROOT_DIR		:= $(TARGET_BUILD_DIR)/$(CONTAINER_PROXY_NAME)-container_sysroot
-CONTAINER_RPOXY_PKG						:= tsg-$(CONTAINER_PROXY_NAME)-${OS_RELEASE_VER}-${PROFILE_ID_IN_SHORT}-docker.tar.gz
-CONTAINER_RPOXY_TAR						:= tsg-$(CONTAINER_PROXY_NAME)-${OS_RELEASE_VER}-docker.tar
-
-CONTAINER_CERTSTORE_NAME				:= certstore
-TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR	:= $(TARGET_BUILD_DIR)/$(CONTAINER_CERTSTORE_NAME)-container_sysroot
-CONTAINER_CERTSTORE_PKG					:= tsg-$(CONTAINER_CERTSTORE_NAME)-${OS_RELEASE_VER}-${PROFILE_ID_IN_SHORT}-docker.tar.gz
-CONTAINER_CERTSTORE_TAR					:= tsg-$(CONTAINER_CERTSTORE_NAME)-${OS_RELEASE_VER}-docker.tar
-
-CONTAINER_TELEGRAF_NAME					:= telegraf
-TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR	:= $(TARGET_BUILD_DIR)/$(CONTAINER_TELEGRAF_NAME)-container_sysroot
-CONTAINER_TELEGRAF_PKG					:= tsg-$(CONTAINER_TELEGRAF_NAME)-${OS_RELEASE_VER}-${PROFILE_ID_IN_SHORT}-docker.tar.gz
-CONTAINER_TELEGRAF_TAR					:= tsg-$(CONTAINER_TELEGRAF_NAME)-${OS_RELEASE_VER}-docker.tar
-
-CONTAINER_INIT_NAME						:= init
-TARGET_CONTAINER_INIT_SYSROOT_DIR		:= $(TARGET_BUILD_DIR)/$(CONTAINER_INIT_NAME)-container_sysroot
-CONTAINER_INIT_PKG						:= tsg-$(CONTAINER_INIT_NAME)-${OS_RELEASE_VER}-${PROFILE_ID_IN_SHORT}-docker.tar.gz
-CONTAINER_INIT_TAR						:= tsg-$(CONTAINER_INIT_NAME)-${OS_RELEASE_VER}-docker.tar
-
-CONTAINER_SCE_NAME						:= sce
-TARGET_CONTAINER_SCE_SYSROOT_DIR		:= $(TARGET_BUILD_DIR)/$(CONTAINER_SCE_NAME)-container_sysroot
-CONTAINER_SCE_PKG						:= tsg-$(CONTAINER_SCE_NAME)-${OS_RELEASE_VER}-${PROFILE_ID_IN_SHORT}-docker.tar.xz
-CONTAINER_SCE_TAR						:= tsg-$(CONTAINER_SCE_NAME)-${OS_RELEASE_VER}-docker.tar
-
-CONTAINER_BFDD_NAME						:= bfdd
-TARGET_CONTAINER_BFDD_SYSROOT_DIR		:= $(TARGET_BUILD_DIR)/$(CONTAINER_BFDD_NAME)-container_sysroot
-CONTAINER_BFDD_PKG						:= tsg-$(CONTAINER_BFDD_NAME)-${OS_RELEASE_VER}-${PROFILE_ID_IN_SHORT}-docker.tar.xz
-CONTAINER_BFDD_TAR						:= tsg-$(CONTAINER_BFDD_NAME)-${OS_RELEASE_VER}-docker.tar
-
-CONTAINER_SHAPING_NAME					:= shaping
-TARGET_CONTAINER_SHAPING_SYSROOT_DIR	:= $(TARGET_BUILD_DIR)/$(CONTAINER_SHAPING_NAME)-container_sysroot
-CONTAINER_SHAPING_PKG					:= tsg-$(CONTAINER_SHAPING_NAME)-${OS_RELEASE_VER}-${PROFILE_ID_IN_SHORT}-docker.tar.xz
-CONTAINER_SHAPING_TAR					:= tsg-$(CONTAINER_SHAPING_NAME)-${OS_RELEASE_VER}-docker.tar
-
-.PHONY: all builddir installer sysroot-base sysroot-cleanup sysroot-archive sysroot-binary  container-sysroot-base container-sysroot-ansible container-images-generate add-images-into-sysroot container-sysroot-cleanup clean
+.PHONY: all builddir installer sysroot-base sysroot-cleanup sysroot-archive sysroot-binary add-images-into-sysroot clean
 
 all: sysroot-binary
 
@@ -88,38 +44,6 @@ installer: builddir
 sysroot-base: builddir
 	$(TOOLSDIR)/mk-base-image $(CONFDIR)/yum-RockyLinux-8.conf $(TARGET_SYSROOT_DIR) $(PROJECTDIR) $(PROFILE_ID)
 
-container-sysroot-base: builddir sysroot-verfile sysroot-ansible
-	rm -rf $(TARGET_CONTAINER_FIREWALL_SYSROOT_DIR)
-	rm -rf $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR)
-	rm -rf $(TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR)
-	rm -rf $(TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR)
-	rm -rf $(TARGET_CONTAINER_INIT_SYSROOT_DIR)
-	rm -rf $(TARGET_CONTAINER_SCE_SYSROOT_DIR)
-	rm -rf $(TARGET_CONTAINER_BFDD_SYSROOT_DIR)
-	rm -rf $(TARGET_CONTAINER_SHAPING_SYSROOT_DIR)
-
-	mkdir -p $(TARGET_CONTAINER_FIREWALL_SYSROOT_DIR)
-	mkdir -p $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR)
-	mkdir -p $(TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR)
-	mkdir -p $(TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR)
-	mkdir -p $(TARGET_CONTAINER_INIT_SYSROOT_DIR)
-	mkdir -p $(TARGET_CONTAINER_SCE_SYSROOT_DIR)
-	mkdir -p $(TARGET_CONTAINER_BFDD_SYSROOT_DIR)
-	mkdir -p $(TARGET_CONTAINER_SHAPING_SYSROOT_DIR)
-
-	mkdir -p $(TARGET_CONTAINER_IMAGE_DIR)
-	mkdir -p $(TARGET_CONTAINER_IMAGE_TAR_DIR)
-
-	tar -Jxf $(PROJECTDIR)/package/rocky-8.6-docker.tar.xz -C $(TARGET_CONTAINER_FIREWALL_SYSROOT_DIR)
-	tar -Jxf $(PROJECTDIR)/package/rocky-8.6-docker.tar.xz -C $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR)
-	tar -Jxf $(PROJECTDIR)/package/rocky-8.6-docker.tar.xz -C $(TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR)
-	tar -Jxf $(PROJECTDIR)/package/rocky-8.6-docker.tar.xz -C $(TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR)
-	tar -Jxf $(PROJECTDIR)/package/rocky-8.6-docker.tar.xz -C $(TARGET_CONTAINER_INIT_SYSROOT_DIR)
-	tar -Jxf $(PROJECTDIR)/package/rocky-8.6-docker.tar.xz -C $(TARGET_CONTAINER_SCE_SYSROOT_DIR)
-	tar -Jxf $(PROJECTDIR)/package/rocky-8.6-docker.tar.xz -C $(TARGET_CONTAINER_BFDD_SYSROOT_DIR)
-	tar -Jxf $(PROJECTDIR)/package/rocky-8.6-docker.tar.xz -C $(TARGET_CONTAINER_SHAPING_SYSROOT_DIR)
-	#curl -SL https://raw.githubusercontent.com/rocky-linux/sig-cloud-instance-images/Rocky-8.5-x86_64/rocky-8.5-docker-x86_64.tar.xz | tar -Jx  -C $(TARGET_CONTAINER_SYSROOT_DIR)
-
 sysroot-verfile: sysroot-base
 	sed -i -e "s/^NAME=.*/NAME=\"TSG-OS\"/" $(TARGET_SYSROOT_DIR)/usr/lib/os-release
 	sed -i -e "s/^VERSION=.*/VERSION=\"$(OS_RELEASE_VER) ($(PROFILE_ID_IN_SHORT))\"/" $(TARGET_SYSROOT_DIR)/usr/lib/os-release
@@ -133,162 +57,16 @@ sysroot-ansible: sysroot-verfile sysroot-base
 	$(TOOLSDIR)/ansible-HAL $(PROFILE_ID) $(PROJECTDIR) $(TARGET_SYSROOT_DIR) /tmp/yum-RockyLinux-8.conf $(OS_RELEASE_VER) $(HELM_CHART_VER)
 	cp $(TARGET_SYSROOT_DIR)/tmp/hosts $(TARGET_SYSROOT_DIR)/etc/ -r
 
-container-sysroot-ansible: container-sysroot-base
-	cp $(CONFDIR)/yum-RockyLinux-8.conf $(TARGET_CONTAINER_FIREWALL_SYSROOT_DIR)/tmp/ -r
-	cp $(CONFDIR)/resolv.conf $(TARGET_CONTAINER_FIREWALL_SYSROOT_DIR)/etc/ -r
-	cp $(TARGET_CONTAINER_FIREWALL_SYSROOT_DIR)/etc/hosts $(TARGET_CONTAINER_FIREWALL_SYSROOT_DIR)/tmp/ -r
-	cp /etc/hosts $(TARGET_CONTAINER_FIREWALL_SYSROOT_DIR)/etc/ -r
-	$(TOOLSDIR)/ansible-HAL $(PROFILE_ID)-$(CONTAINER_FIREWALL_NAME) $(PROJECTDIR) $(TARGET_CONTAINER_FIREWALL_SYSROOT_DIR) /tmp/yum-RockyLinux-8.conf $(OS_RELEASE_VER)
-	cp $(TARGET_CONTAINER_FIREWALL_SYSROOT_DIR)/tmp/hosts $(TARGET_CONTAINER_FIREWALL_SYSROOT_DIR)/etc/ -r
-
-	cp $(CONFDIR)/yum-RockyLinux-8.conf $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR)/tmp/ -r
-	cp $(CONFDIR)/resolv.conf $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR)/etc/ -r
-	cp $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR)/etc/hosts $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR)/tmp/ -r
-	cp /etc/hosts $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR)/etc/ -r
-	$(TOOLSDIR)/ansible-HAL $(PROFILE_ID)-$(CONTAINER_PROXY_NAME) $(PROJECTDIR) $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR) /tmp/yum-RockyLinux-8.conf $(OS_RELEASE_VER)
-	cp $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR)/tmp/hosts $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR)/etc/ -r
-
-	cp $(CONFDIR)/yum-RockyLinux-8.conf $(TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR)/tmp/ -r
-	cp $(CONFDIR)/resolv.conf $(TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR)/etc/ -r
-	cp $(TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR)/etc/hosts $(TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR)/tmp/ -r
-	cp /etc/hosts $(TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR)/etc/ -r
-	$(TOOLSDIR)/ansible-HAL $(PROFILE_ID)-$(CONTAINER_CERTSTORE_NAME) $(PROJECTDIR) $(TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR) /tmp/yum-RockyLinux-8.conf $(OS_RELEASE_VER)
-	cp $(TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR)/tmp/hosts $(TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR)/etc/ -r
-
-	cp $(CONFDIR)/yum-RockyLinux-8.conf $(TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR)/tmp/ -r
-	cp $(CONFDIR)/resolv.conf $(TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR)/etc/ -r
-	cp $(TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR)/etc/hosts $(TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR)/tmp/ -r
-	cp /etc/hosts $(TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR)/etc/ -r
-	$(TOOLSDIR)/ansible-HAL $(PROFILE_ID)-$(CONTAINER_TELEGRAF_NAME) $(PROJECTDIR) $(TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR) /tmp/yum-RockyLinux-8.conf $(OS_RELEASE_VER)
-	cp $(TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR)/tmp/hosts $(TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR)/etc/ -r
-
-	cp $(CONFDIR)/yum-RockyLinux-8.conf $(TARGET_CONTAINER_INIT_SYSROOT_DIR)/tmp/ -r
-	cp $(CONFDIR)/resolv.conf $(TARGET_CONTAINER_INIT_SYSROOT_DIR)/etc/ -r
-	cp $(TARGET_CONTAINER_INIT_SYSROOT_DIR)/etc/hosts $(TARGET_CONTAINER_INIT_SYSROOT_DIR)/tmp/ -r
-	cp /etc/hosts $(TARGET_CONTAINER_INIT_SYSROOT_DIR)/etc/ -r
-	$(TOOLSDIR)/ansible-HAL $(PROFILE_ID)-$(CONTAINER_INIT_NAME) $(PROJECTDIR) $(TARGET_CONTAINER_INIT_SYSROOT_DIR) /tmp/yum-RockyLinux-8.conf $(OS_RELEASE_VER)
-	cp $(TARGET_CONTAINER_INIT_SYSROOT_DIR)/tmp/hosts $(TARGET_CONTAINER_INIT_SYSROOT_DIR)/etc/ -r
-
-	cp $(CONFDIR)/yum-RockyLinux-8.conf $(TARGET_CONTAINER_SCE_SYSROOT_DIR)/tmp/ -r
-	cp $(CONFDIR)/resolv.conf $(TARGET_CONTAINER_SCE_SYSROOT_DIR)/etc/ -r
-	cp $(TARGET_CONTAINER_SCE_SYSROOT_DIR)/etc/hosts $(TARGET_CONTAINER_SCE_SYSROOT_DIR)/tmp/ -r
-	cp /etc/hosts $(TARGET_CONTAINER_SCE_SYSROOT_DIR)/etc/ -r
-	$(TOOLSDIR)/ansible-HAL $(PROFILE_ID)-$(CONTAINER_SCE_NAME) $(PROJECTDIR) $(TARGET_CONTAINER_SCE_SYSROOT_DIR) /tmp/yum-RockyLinux-8.conf $(OS_RELEASE_VER)
-	cp $(TARGET_CONTAINER_SCE_SYSROOT_DIR)/tmp/hosts $(TARGET_CONTAINER_SCE_SYSROOT_DIR)/etc/ -r
-
-	cp $(CONFDIR)/yum-RockyLinux-8.conf $(TARGET_CONTAINER_BFDD_SYSROOT_DIR)/tmp/ -r
-	cp $(CONFDIR)/resolv.conf $(TARGET_CONTAINER_BFDD_SYSROOT_DIR)/etc/ -r
-	cp $(TARGET_CONTAINER_BFDD_SYSROOT_DIR)/etc/hosts $(TARGET_CONTAINER_BFDD_SYSROOT_DIR)/tmp/ -r
-	cp /etc/hosts $(TARGET_CONTAINER_BFDD_SYSROOT_DIR)/etc/ -r
-	$(TOOLSDIR)/ansible-HAL $(PROFILE_ID)-$(CONTAINER_BFDD_NAME) $(PROJECTDIR) $(TARGET_CONTAINER_BFDD_SYSROOT_DIR) /tmp/yum-RockyLinux-8.conf $(OS_RELEASE_VER)
-	cp $(TARGET_CONTAINER_BFDD_SYSROOT_DIR)/tmp/hosts $(TARGET_CONTAINER_BFDD_SYSROOT_DIR)/etc/ -r
-
-	cp $(CONFDIR)/yum-RockyLinux-8.conf $(TARGET_CONTAINER_SHAPING_SYSROOT_DIR)/tmp/ -r
-	cp $(CONFDIR)/resolv.conf $(TARGET_CONTAINER_SHAPING_SYSROOT_DIR)/etc/ -r
-	cp $(TARGET_CONTAINER_SHAPING_SYSROOT_DIR)/etc/hosts $(TARGET_CONTAINER_SHAPING_SYSROOT_DIR)/tmp/ -r
-	cp /etc/hosts $(TARGET_CONTAINER_SHAPING_SYSROOT_DIR)/etc/ -r
-	$(TOOLSDIR)/ansible-HAL $(PROFILE_ID)-$(CONTAINER_SHAPING_NAME) $(PROJECTDIR) $(TARGET_CONTAINER_SHAPING_SYSROOT_DIR) /tmp/yum-RockyLinux-8.conf $(OS_RELEASE_VER)
-	cp $(TARGET_CONTAINER_SHAPING_SYSROOT_DIR)/tmp/hosts $(TARGET_CONTAINER_SHAPING_SYSROOT_DIR)/etc/ -r
-
-container-sysroot-cleanup:
-	cp $(TARGET_CONTAINER_FIREWALL_SYSROOT_DIR)/tmp/ks-script-* $(TARGET_CONTAINER_FIREWALL_SYSROOT_DIR)
-	rm -rf $(TARGET_CONTAINER_FIREWALL_SYSROOT_DIR)/tmp/*
-	rm -rf $(TARGET_CONTAINER_FIREWALL_SYSROOT_DIR)/dev/*
-	mv $(TARGET_CONTAINER_FIREWALL_SYSROOT_DIR)/ks-script-* $(TARGET_CONTAINER_FIREWALL_SYSROOT_DIR)/tmp
-
-	cp $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR)/tmp/ks-script-* $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR)
-	rm -rf $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR)/tmp/*
-	rm -rf $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR)/dev/*
-	mv $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR)/ks-script-* $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR)/tmp
-
-	cp $(TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR)/tmp/ks-script-* $(TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR)
-	rm -rf $(TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR)/tmp/*
-	rm -rf $(TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR)/dev/*
-	mv $(TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR)/ks-script-* $(TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR)/tmp
-
-	cp $(TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR)/tmp/ks-script-* $(TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR)
-	rm -rf $(TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR)/tmp/*
-	rm -rf $(TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR)/dev/*
-	mv $(TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR)/ks-script-* $(TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR)/tmp
-
-	cp $(TARGET_CONTAINER_INIT_SYSROOT_DIR)/tmp/ks-script-* $(TARGET_CONTAINER_INIT_SYSROOT_DIR)
-	rm -rf $(TARGET_CONTAINER_INIT_SYSROOT_DIR)/tmp/*
-	rm -rf $(TARGET_CONTAINER_INIT_SYSROOT_DIR)/dev/*
-	mv $(TARGET_CONTAINER_INIT_SYSROOT_DIR)/ks-script-* $(TARGET_CONTAINER_INIT_SYSROOT_DIR)/tmp
-
-	cp $(TARGET_CONTAINER_SCE_SYSROOT_DIR)/tmp/ks-script-* $(TARGET_CONTAINER_SCE_SYSROOT_DIR)
-	rm -rf $(TARGET_CONTAINER_SCE_SYSROOT_DIR)/tmp/*
-	rm -rf $(TARGET_CONTAINER_SCE_SYSROOT_DIR)/dev/*
-	mv $(TARGET_CONTAINER_SCE_SYSROOT_DIR)/ks-script-* $(TARGET_CONTAINER_SCE_SYSROOT_DIR)/tmp
-
-	cp $(TARGET_CONTAINER_BFDD_SYSROOT_DIR)/tmp/ks-script-* $(TARGET_CONTAINER_BFDD_SYSROOT_DIR)
-	rm -rf $(TARGET_CONTAINER_BFDD_SYSROOT_DIR)/tmp/*
-	rm -rf $(TARGET_CONTAINER_BFDD_SYSROOT_DIR)/dev/*
-	mv $(TARGET_CONTAINER_BFDD_SYSROOT_DIR)/ks-script-* $(TARGET_CONTAINER_BFDD_SYSROOT_DIR)/tmp
-
-	cp $(TARGET_CONTAINER_SHAPING_SYSROOT_DIR)/tmp/ks-script-* $(TARGET_CONTAINER_SHAPING_SYSROOT_DIR)
-	rm -rf $(TARGET_CONTAINER_SHAPING_SYSROOT_DIR)/tmp/*
-	rm -rf $(TARGET_CONTAINER_SHAPING_SYSROOT_DIR)/dev/*
-	mv $(TARGET_CONTAINER_SHAPING_SYSROOT_DIR)/ks-script-* $(TARGET_CONTAINER_SHAPING_SYSROOT_DIR)/tmp
-
-container-images-generate: container-sysroot-ansible container-sysroot-cleanup
-	tar -Jcf $(TARGET_CONTAINER_IMAGE_DIR)/$(CONTAINER_FIREWALL_PKG) -C $(TARGET_CONTAINER_FIREWALL_SYSROOT_DIR) .
-	echo -e "FROM scratch\nADD $(CONTAINER_FIREWALL_PKG) /\n\nCMD ["/bin/bash"]\n" > $(CONTAINER_DOCKERFILE)
-	docker build -t tsg-${CONTAINER_FIREWALL_NAME}:$(OS_RELEASE_VER) -f $(CONTAINER_DOCKERFILE) $(TARGET_CONTAINER_IMAGE_DIR)
-	docker save tsg-${CONTAINER_FIREWALL_NAME}:$(OS_RELEASE_VER) > $(TARGET_CONTAINER_IMAGE_TAR_DIR)/$(CONTAINER_FIREWALL_TAR)
-	docker rmi tsg-${CONTAINER_FIREWALL_NAME}:$(OS_RELEASE_VER)
-
-	tar -Jcf $(TARGET_CONTAINER_IMAGE_DIR)/$(CONTAINER_RPOXY_PKG) -C $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR) .
-	echo -e "FROM scratch\nADD $(CONTAINER_RPOXY_PKG) /\n\nCMD ["/bin/bash"]\n" > $(CONTAINER_DOCKERFILE)
-	docker build -t tsg-$(CONTAINER_PROXY_NAME):$(OS_RELEASE_VER) -f $(CONTAINER_DOCKERFILE) $(TARGET_CONTAINER_IMAGE_DIR)
-	docker save tsg-$(CONTAINER_PROXY_NAME):$(OS_RELEASE_VER) > $(TARGET_CONTAINER_IMAGE_TAR_DIR)/$(CONTAINER_RPOXY_TAR)
-	docker rmi tsg-$(CONTAINER_PROXY_NAME):$(OS_RELEASE_VER)
-
-	tar -Jcf $(TARGET_CONTAINER_IMAGE_DIR)/$(CONTAINER_CERTSTORE_PKG) -C $(TARGET_CONTAINER_CERTSTORE_SYSROOT_DIR) .
-	echo -e "FROM scratch\nADD $(CONTAINER_CERTSTORE_PKG) /\n\nCMD ["/bin/bash"]\n" > $(CONTAINER_DOCKERFILE)
-	docker build -t tsg-$(CONTAINER_CERTSTORE_NAME):$(OS_RELEASE_VER) -f $(CONTAINER_DOCKERFILE) $(TARGET_CONTAINER_IMAGE_DIR)
-	docker save tsg-$(CONTAINER_CERTSTORE_NAME):$(OS_RELEASE_VER) > $(TARGET_CONTAINER_IMAGE_TAR_DIR)/$(CONTAINER_CERTSTORE_TAR)
-	docker rmi tsg-$(CONTAINER_CERTSTORE_NAME):$(OS_RELEASE_VER)
-
-	tar -Jcf $(TARGET_CONTAINER_IMAGE_DIR)/$(CONTAINER_TELEGRAF_PKG) -C $(TARGET_CONTAINER_TELEGRAF_SYSROOT_DIR) .
-	echo -e "FROM scratch\nADD $(CONTAINER_TELEGRAF_PKG) /\n\nCMD ["/bin/bash"]\n" > $(CONTAINER_DOCKERFILE)
-	docker build -t tsg-$(CONTAINER_TELEGRAF_NAME):$(OS_RELEASE_VER) -f $(CONTAINER_DOCKERFILE) $(TARGET_CONTAINER_IMAGE_DIR)
-	docker save tsg-$(CONTAINER_TELEGRAF_NAME):$(OS_RELEASE_VER) > $(TARGET_CONTAINER_IMAGE_TAR_DIR)/$(CONTAINER_TELEGRAF_TAR)
-	docker rmi tsg-$(CONTAINER_TELEGRAF_NAME):$(OS_RELEASE_VER)
-
-	tar -Jcf $(TARGET_CONTAINER_IMAGE_DIR)/$(CONTAINER_INIT_PKG) -C $(TARGET_CONTAINER_INIT_SYSROOT_DIR) .
-	echo -e "FROM scratch\nADD $(CONTAINER_INIT_PKG) /\n\nCMD ["/bin/bash"]\n" > $(CONTAINER_DOCKERFILE)
-	docker build -t tsg-$(CONTAINER_INIT_NAME):$(OS_RELEASE_VER) -f $(CONTAINER_DOCKERFILE) $(TARGET_CONTAINER_IMAGE_DIR)
-	docker save tsg-$(CONTAINER_INIT_NAME):$(OS_RELEASE_VER) > $(TARGET_CONTAINER_IMAGE_TAR_DIR)/$(CONTAINER_INIT_TAR)
-	docker rmi tsg-$(CONTAINER_INIT_NAME):$(OS_RELEASE_VER)
-
-	tar -Jcf $(TARGET_CONTAINER_IMAGE_DIR)/$(CONTAINER_SCE_PKG) -C $(TARGET_CONTAINER_SCE_SYSROOT_DIR) .
-	echo -e "FROM scratch\nADD $(CONTAINER_SCE_PKG) /\n\nCMD ["/bin/bash"]\n" > $(CONTAINER_DOCKERFILE)
-	docker build -t tsg-$(CONTAINER_SCE_NAME):$(OS_RELEASE_VER) -f $(CONTAINER_DOCKERFILE) $(TARGET_CONTAINER_IMAGE_DIR)
-	docker save tsg-$(CONTAINER_SCE_NAME):$(OS_RELEASE_VER) > $(TARGET_CONTAINER_IMAGE_TAR_DIR)/$(CONTAINER_SCE_TAR)
-	docker rmi tsg-$(CONTAINER_SCE_NAME):$(OS_RELEASE_VER)
-
-	tar -Jcf $(TARGET_CONTAINER_IMAGE_DIR)/$(CONTAINER_BFDD_PKG) -C $(TARGET_CONTAINER_BFDD_SYSROOT_DIR) .
-	echo -e "FROM scratch\nADD $(CONTAINER_BFDD_PKG) /\n\nCMD ["/bin/bash"]\n" > $(CONTAINER_DOCKERFILE)
-	docker build -t tsg-$(CONTAINER_BFDD_NAME):$(OS_RELEASE_VER) -f $(CONTAINER_DOCKERFILE) $(TARGET_CONTAINER_IMAGE_DIR)
-	docker save tsg-$(CONTAINER_BFDD_NAME):$(OS_RELEASE_VER) > $(TARGET_CONTAINER_IMAGE_TAR_DIR)/$(CONTAINER_BFDD_TAR)
-	docker rmi tsg-$(CONTAINER_BFDD_NAME):$(OS_RELEASE_VER)
-
-	tar -Jcf $(TARGET_CONTAINER_IMAGE_DIR)/$(CONTAINER_SHAPING_PKG) -C $(TARGET_CONTAINER_SHAPING_SYSROOT_DIR) .
-	echo -e "FROM scratch\nADD $(CONTAINER_SHAPING_PKG) /\n\nCMD ["/bin/bash"]\n" > $(CONTAINER_DOCKERFILE)
-	docker build -t tsg-$(CONTAINER_SHAPING_NAME):$(OS_RELEASE_VER) -f $(CONTAINER_DOCKERFILE) $(TARGET_CONTAINER_IMAGE_DIR)
-	docker save tsg-$(CONTAINER_SHAPING_NAME):$(OS_RELEASE_VER) > $(TARGET_CONTAINER_IMAGE_TAR_DIR)/$(CONTAINER_SHAPING_TAR)
-	docker rmi tsg-$(CONTAINER_SHAPING_NAME):$(OS_RELEASE_VER)
-
 sysroot-cleanup:
 	rm -rf $(TARGET_SYSROOT_DIR)/tmp/*
 	rm -rf $(TARGET_SYSROOT_DIR)/dev/*
 
-add-images-into-sysroot: container-images-generate
-	tar --exclude=*~ --exclude-backups --owner=root --group=root -c -C $(TARGET_CONTAINER_IMAGE_TAR_DIR) . | pbzip2 -p9 > $(TARGET_INSTALLER_DIR)/$(CONTAINER_IMAGES_PKG)
+add-images-into-sysroot: builddir sysroot-verfile sysroot-ansible
+	mv $(IMAGEDIR_BASE)/$(CONTAINER_IMAGES_PKG) $(TARGET_INSTALLER_DIR)/$(CONTAINER_IMAGES_PKG)
+	rm $(IMAGEDIR_BASE)/$(CONTAINER_IMAGES_PKG).sha256sum.txt
 
 sysroot-archive: installer add-images-into-sysroot sysroot-cleanup
-	cp $(TARGET_CONTAINER_RPOXY_SYSROOT_DIR)/etc/sysctl.d/80-tfe.conf $(TARGET_SYSROOT_DIR)/etc/sysctl.d/
+	mv $(IMAGEDIR_BASE)/80-tfe.conf $(TARGET_SYSROOT_DIR)/etc/sysctl.d/
 	tar --exclude=*~ --exclude-backups --owner=root --group=root -c -C $(TARGET_SYSROOT_DIR) . | pbzip2 -p9 > $(TARGET_INSTALLER_DIR)/$(CHROOT_PKG)
 
 sysroot-binary: sysroot-archive
diff --git a/package/rocky-8.6-docker.tar.xz b/package/rocky-8.6-docker.tar.xz
deleted file mode 100644
index ed7fee87..00000000
Binary files a/package/rocky-8.6-docker.tar.xz and /dev/null differ
diff --git a/tools/ansible-HAL-CONTAINER b/tools/ansible-HAL-CONTAINER
new file mode 100644
index 00000000..53149945
--- /dev/null
+++ b/tools/ansible-HAL-CONTAINER
@@ -0,0 +1,17 @@
+#!/bin/sh -ex
+
+PROFILE_ID=$1
+PROJECTDIR=$2
+TARGET_SYSROOT_DIR=$3
+YUM_CONF_PATH=$4
+OS_RELEASE_VER=$5
+CONTAINER_NAME=$6
+HELM_CHART_VER="0.1.0"
+
+echo "-----------------------------  Ansible Stage 1  ----------------------------"
+echo "$PROFILE_ID"
+
+echo "[$PROFILE_ID]" > $PROJECTDIR/ansible/install_config/hosts
+echo "$CONTAINER_NAME  ansible_connection=buildah" >> $PROJECTDIR/ansible/install_config/hosts
+
+ansible-playbook -c buildah -i $PROJECTDIR/ansible/install_config/hosts $PROJECTDIR/ansible/HAL_deploy.yml -e "rpm_repo_config_path=$YUM_CONF_PATH PROFILE_ID=$PROFILE_ID path_download=/tmp/rpm_download os_release_ver=$OS_RELEASE_VER helm_chart_ver=$HELM_CHART_VER"
diff --git a/tools/mk-kvm.sh b/tools/mk-kvm.sh
index f83c3fca..12a74b8b 100644
--- a/tools/mk-kvm.sh
+++ b/tools/mk-kvm.sh
@@ -5,7 +5,7 @@
 #  SPDX-License-Identifier:     GPL-2.0
 set -xe
 
-MEM=24576
+MEM=12288
 DISK=$1
 
 # Path to ONIE installer .iso image
diff --git a/tools/upload.sh b/tools/upload.sh
index 75141983..0f66a75c 100644
--- a/tools/upload.sh
+++ b/tools/upload.sh
@@ -11,6 +11,8 @@ if [ -n "${UPLOAD_TO_FILE_REPO}" ]; then
 	elif [ "${PROFILE_LIST}" == "KVM" ]; then
 		python3 ~/file_upload_tools_to_share_repo.py ${FILE_REPO_PATH} ./images/*.img
 		python3 ~/file_upload_tools_to_share_repo.py ${FILE_REPO_PATH} ./images/*.gns3a
+	elif [ "${PROFILE_LIST}" == "TSGXBUILDCONTAINERP0906" ]; then
+		python3 ~/file_upload_tools_to_share_repo.py ${FILE_REPO_PATH} ./images/*.tar.bz2
 	else
 		python3 ~/file_upload_tools_to_share_repo.py ${FILE_REPO_PATH} ./images/*.bin
 	fi