diff --git a/Dockerfile b/Dockerfile
index ca5f70d4688e..8d9f10b663aa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,22 +11,22 @@ RUN adduser --disabled-password $USER
 WORKDIR $USER
 
 # Copy Resources
-COPY buildroot buildroot
-COPY thunder thunder
-COPY thunder-client-libraries thunder-client-libraries
-COPY thunder-interfaces thunder-interfaces
-COPY thunder-plugins thunder-plugins
-COPY thunder-rdk-services thunder-rdk-services
-COPY thunder-tools thunder-tools
+#COPY buildroot buildroot
+#COPY thunder thunder
+#COPY thunder-client-libraries thunder-client-libraries
+#COPY thunder-interfaces thunder-interfaces
+#COPY thunder-plugins thunder-plugins
+#COPY thunder-rdk-services thunder-rdk-services
+#COPY thunder-tools thunder-tools
 
 # Run Build
 WORKDIR $USER/buildroot/
-RUN echo WPEFRAMEWORK_OVERRIDE_SRCDIR=../thunder > local.mk
-RUN echo WPEFRAMEWORK_CLIENTLIBRARIES_OVERRIDE_SRCDIR=../thunder-client-libraries >> local.mk
-RUN echo WPEFRAMEWORK_INTERFACES_OVERRIDE_SRCDIR=../thunder-interfaces >> local.mk
-RUN echo WPEFRAMEWORK_PLUGINS_OVERRIDE_SRCDIR=../thunder-plugins >> local.mk
-RUN echo WPEFRAMEWORK_RDKSERVICES_OVERRIDE_SRCDIR=../thunder-rdk-services >> local.mk
-RUN echo WPEFRAMEWORK_TOOLS_OVERRIDE_SRCDIR=../thunder-tools >> local.mk
+#RUN echo WPEFRAMEWORK_OVERRIDE_SRCDIR=../thunder > local.mk
+#RUN echo WPEFRAMEWORK_CLIENTLIBRARIES_OVERRIDE_SRCDIR=../thunder-client-libraries >> local.mk
+#RUN echo WPEFRAMEWORK_INTERFACES_OVERRIDE_SRCDIR=../thunder-interfaces >> local.mk
+#RUN echo WPEFRAMEWORK_PLUGINS_OVERRIDE_SRCDIR=../thunder-plugins >> local.mk
+#RUN echo WPEFRAMEWORK_RDKSERVICES_OVERRIDE_SRCDIR=../thunder-rdk-services >> local.mk
+#RUN echo WPEFRAMEWORK_TOOLS_OVERRIDE_SRCDIR=../thunder-tools >> local.mk
 
 ENV FORCE_UNSAFE_CONFIGURE=1
 RUN make raspberrypi3_wpe_defconfig 
diff --git a/ci/backup_pl b/ci/backup_pl
new file mode 100644
index 000000000000..a319121582f8
--- /dev/null
+++ b/ci/backup_pl
@@ -0,0 +1,86 @@
+resources:
+- name: buildroot
+  type: git
+  icon: github
+  source:
+    branch: Divya-test
+    uri: https://github.com/WebPlatformForEmbedded/buildroot/
+    password: ((service-account.access-token))
+
+- name: thunder
+  type: git
+  icon: github
+  source:
+    uri: https://github.com/rdkcentral/Thunder/
+    password: ((service-account.access-token))
+
+- name: thunder-client-libraries
+  type: git
+  icon: github
+  source:
+    uri: https://github.com/rdkcentral/ThunderClientLibraries
+    password: ((service-account.access-token))
+
+- name: thunder-interfaces
+  type: git
+  icon: github
+  source:
+    uri: https://github.com/rdkcentral/ThunderInterfaces
+    password: ((service-account.access-token))
+
+- name: thunder-plugins
+  type: git
+  icon: github
+  source:
+    uri: https://github.com/rdkcentral/ThunderNanoServices
+    password: ((service-account.access-token))
+
+- name: thunder-rdk-services
+  type: git
+  icon: github
+  source:
+    uri: https://github.com/WebPlatformForEmbedded/ThunderNanoServicesRDK
+    password: ((service-account.access-token))
+
+- name: thunder-tools
+  type: git
+  icon: github
+  source:
+    uri: https://github.com/rdkcentral/ThunderTools
+    password: ((service-account.access-token))
+
+- name: buildroot-docker-image
+  type: docker-image
+  check_every: 72h
+  source:
+    repository: hub.comcast.net/tpx-metrological-embedded/rootfs
+    username: ((service-account.username))
+    password: ((service-account.password))
+
+jobs:
+- name: image-push
+  plan:
+  - get: buildroot
+    trigger: true
+  - get: thunder
+    trigger: true
+  - get: thunder-client-libraries
+    trigger: true
+  - get: thunder-interfaces
+    trigger: true
+  - get: thunder-plugins
+    trigger: true
+  - get: thunder-rdk-services
+    trigger: true
+  - get: thunder-tools
+    trigger: true
+  - put: buildroot-docker-image
+    params:
+      build: buildroot
+      tag_as_latest: true
+      build: thunder-client-libraries
+      build: thunder-interfaces
+      build: thunder-plugins
+      build: thunder-rdk-services
+      build: thunder-tools
+
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index 5b6f4e76e16a..879a2dbef380 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -7,50 +7,9 @@ resources:
     uri: https://github.com/WebPlatformForEmbedded/buildroot/
     password: ((service-account.access-token))
 
-- name: thunder
-  type: git
-  icon: github
-  source:
-    uri: https://github.com/rdkcentral/Thunder/
-    password: ((service-account.access-token))
-
-- name: thunder-client-libraries
-  type: git
-  icon: github
-  source:
-    uri: https://github.com/rdkcentral/ThunderClientLibraries
-    password: ((service-account.access-token))
-
-- name: thunder-interfaces
-  type: git
-  icon: github
-  source:
-    uri: https://github.com/rdkcentral/ThunderInterfaces
-    password: ((service-account.access-token))
-
-- name: thunder-plugins
-  type: git
-  icon: github
-  source:
-    uri: https://github.com/rdkcentral/ThunderNanoServices
-    password: ((service-account.access-token))
-
-- name: thunder-rdk-services
-  type: git
-  icon: github
-  source:
-    uri: https://github.com/WebPlatformForEmbedded/ThunderNanoServicesRDK
-    password: ((service-account.access-token))
-
-- name: thunder-tools
-  type: git
-  icon: github
-  source:
-    uri: https://github.com/rdkcentral/ThunderTools
-    password: ((service-account.access-token))
-
 - name: buildroot-docker-image
   type: docker-image
+  icon: docker
   check_every: 72h
   source:
     repository: hub.comcast.net/tpx-metrological-embedded/rootfs
@@ -58,23 +17,11 @@ resources:
     password: ((service-account.password))
 
 jobs:
-- name: image-push
+- name: build-rootfs
   plan:
   - get: buildroot
     trigger: true
-  - get: thunder
-    trigger: true
-  - get: thunder-client-libraries
-    trigger: true
-  - get: thunder-interfaces
-    trigger: true
-  - get: thunder-plugins
-    trigger: true
-  - get: thunder-rdk-services
-    trigger: true
-  - get: thunder-tools
-    trigger: true
   - put: buildroot-docker-image
     params:
-      build: buildroot
+      image: output/images/rootfs.tar
       tag_as_latest: true