diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index daafd36cbc36ee4ff032fc0ed7a096ce7c3117a6..87a5d2d66dcf8d92f6648734033fb52f9c8f94d7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,6 +22,21 @@ build_daq:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - docker build -t $CI_REGISTRY_IMAGE/daq:$CI_COMMIT_REF_SLUG ./faser-daq
     - docker push $CI_REGISTRY_IMAGE/daq:$CI_COMMIT_REF_SLUG
+
+build_trackercalibration:
+  stage: package
+  tags: 
+  - docker-privileged-xl
+  image: docker:20.10.16
+  services:
+  - docker:20.10.16-dind
+  variables:
+     DOCKER_TLS_CERTDIR: "/certs"
+  script:
+    - docker info
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - docker build -t $CI_REGISTRY_IMAGE/trackercalibration:$CI_COMMIT_REF_SLUG ./trackercalibration
+    - docker push $CI_REGISTRY_IMAGE/trackercalibration:$CI_COMMIT_REF_SLUG
     
     
 #build_offline:
diff --git a/trackercalibration/Dockerfile b/trackercalibration/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..30e89f20009229b0ed06dea2999767492be7ac95
--- /dev/null
+++ b/trackercalibration/Dockerfile
@@ -0,0 +1,23 @@
+# start from the base daqling repository
+# https://gitlab.cern.ch/ep-dt-di/daq/daqling/blob/XXX/etc/Dockerfile
+
+FROM gitlab-registry.cern.ch/ep-dt-di/daq/daqling:fc-al9
+
+# put all of the code within the /faser/daq directory in the image
+ADD . /faser/trackercalibration
+WORKDIR /faser/trackercalibration
+
+# boost dependency
+RUN dnf install boost-devel && dnf clean all
+    
+# dependencies for gpiodrivers & faser-common
+RUN dnf install -y lz4 lz4-devel libzstd libzstd-devel eigen3-devel libusb-devel json-devel && dnf clean all
+
+# trackercalibration dependencies
+RUN dnf -y install root root-tpython
+
+ENV HOME /home
+
+COPY startup.sh $HOME/startup.sh
+
+ENTRYPOINT ["/bin/bash", "/home/startup.sh","/bin/bash"]
diff --git a/trackercalibration/startup.sh b/trackercalibration/startup.sh
new file mode 100644
index 0000000000000000000000000000000000000000..d742190f3001b4c681e2b601b2ab095d0f7e7083
--- /dev/null
+++ b/trackercalibration/startup.sh
@@ -0,0 +1,2 @@
+echo "Placing you in bash env - Remember, YOU ARE A BEAUTIFUL PERSON! Now go get some!"
+/bin/bash