diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 25a9fb8..303d44f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,6 +9,21 @@ build:
   script:
     - cargo-leptos build
 
+# Build the docker image and push it to the registry
+docker-build:
+  stage: build
+  image: docker:latest
+  script:
+    - /usr/local/bin/dockerd-entrypoint.sh &
+    - while ! docker info; do echo "Waiting for Docker to become available..."; sleep 1; done
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD registry.mregirouard.com
+    - docker build -t registry.mregirouard.com/libretunes/libretunes:$CI_COMMIT_SHORT_SHA .
+      # If running on the default branch, tag as latest
+    - if [ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]; then docker tag
+        registry.mregirouard.com/libretunes/libretunes:$CI_COMMIT_SHORT_SHA
+        registry.mregirouard.com/libretunes/libretunes:latest; fi
+    - docker push registry.mregirouard.com/libretunes/libretunes --all-tags
+
 # Run unit tests
 test:
   stage: test