diff --git a/Dockerfile b/Dockerfile
index 1c857fc9d96e..4ec8bf068bbd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,33 @@
+# Operating System
 FROM ubuntu:22.04
 
+# Dependencies
 RUN apt-get update
 RUN apt-get install -y file wget cpio rsync build-essential git subversion cvs unzip whois ncurses-dev bc mercurial pmount gcc-multilib g++-multilib libgmp3-dev libmpc-dev liblz4-tool
-ARG USER=divya
 
-RUN adduser $USER
-RUN git clone https://github.com/WebPlatformForEmbedded/buildroot.git
-RUN cd buildroot
-RUN cp -rf buildroot/ /home/divya/
-WORKDIR /home/divya/buildroot
+# User & Workdir
+ARG USER=metrological
+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
+
+# Run Build
+WORKDIR $USER/buildroot/
+echo WPEFRAMEWORK_OVERRIDE_SRCDIR=../thunder > local.mk
+echo WPEFRAMEWORK_CLIENTLIBRARIES_OVERRIDE_SRCDIR=../thunder-client-libraries >> local.mk
+echo WPEFRAMEWORK_INTERFACES_OVERRIDE_SRCDIR=../thunder-interfaces >> local.mk
+echo WPEFRAMEWORK_PLUGINS_OVERRIDE_SRCDIR=../thunder-plugins >> local.mk
+echo WPEFRAMEWORK_RDKSERVICES_OVERRIDE_SRCDIR=../thunder-rdk-services >> local.mk
+echo WPEFRAMEWORK_TOOLS_OVERRIDE_SRCDIR=../thunder-tools >> local.mk
+
 ENV FORCE_UNSAFE_CONFIGURE=1
 RUN make raspberrypi3_wpe_defconfig 
 RUN make
diff --git a/ci/build.yml b/ci/backup/build.yml
similarity index 100%
rename from ci/build.yml
rename to ci/backup/build.yml
diff --git a/ci/pipeline.yml-bkp b/ci/backup/pipeline.yml-bkp
similarity index 100%
rename from ci/pipeline.yml-bkp
rename to ci/backup/pipeline.yml-bkp
diff --git a/ci/prepare-build.sh b/ci/backup/prepare-build.sh
similarity index 100%
rename from ci/prepare-build.sh
rename to ci/backup/prepare-build.sh
diff --git a/ci/prepare-build.yml b/ci/backup/prepare-build.yml
similarity index 100%
rename from ci/prepare-build.yml
rename to ci/backup/prepare-build.yml
diff --git a/ci/tasks/build.yml b/ci/backup/tasks/build.yml
similarity index 100%
rename from ci/tasks/build.yml
rename to ci/backup/tasks/build.yml
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index 0da399459e42..5b6f4e76e16a 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -1,32 +1,80 @@
-# test for buildroot
 resources:
 - name: buildroot
   type: git
   icon: github
   source:
-    uri: https://github.com/WebPlatformForEmbedded/buildroot/
     branch: Divya-test
-   # password: ((github-enterprise.access-token))
+    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
+    repository: hub.comcast.net/tpx-metrological-embedded/rootfs
     username: ((service-account.username))
     password: ((service-account.password))
 
-
 jobs:
-
-jobs:
-- name: build-rootfs
+- 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}
-    get_params: {rootfs: true}
-  - put: buildroot-docker-image
-    params: {file: buildroot-docker-image/rootfs.tar}
+    params:
+      build: buildroot
+      tag_as_latest: true