diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 36e1c8a..89111f3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,44 @@
-get_vars:
-  stage: test
+image: docker
+
+stages:
+  - default
+
+variables:
+  USER: shockrah
+
+before_script:
+  - docker login --username $USER --password $PASS
+
+
+build-freechat-prod:
+  # Can't use variables section here due to the sub shell being invoked here
+  before_script:
+    - export VERSION="$(date +%d-%m-%Y)"
+
+  stage: default
+  only:
+    refs:
+      - master
+    changes:
+      - Freechat/Dockerfile
   script:
-    - sleep 10 &
-    - a=$!
-    - echo $a
-    - setsid echo this testvar value is $TEST_VAR
+    - cd Freechat/
+    - echo $VERSION
+    - docker build -t freechat .
+    - docker tag freechat "$USER/freechat:$VERSION"
+    - docker push "$USER/freechat:$VERSION"
+
+
+build-freechat-pipeline:
+  stage: default
+  only:
+    refs:
+      - master
+    changes:
+      - freechat-pipeline/entrypoint.sh
+      - freechat-pipeline/Dockerfile
+  script:
+    - cd freechat-pipeline/
+    - docker build -t freechat-pipeline .
+    - docker tag freechat-pipeline "$USER/freechat-pipeline:latest"
+    - docker push "$USER/freechat-pipeline:latest"