diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..ef96ee1
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,57 @@
+image: docker:19.03.13
+
+services:
+  - docker:19.03.13-dind
+
+variables:
+  DOCKER_HOST: tcp://docker:2375
+  DOCKER_TCP_PORT: 2375
+  DOCKER_TLS_CERTDIR: ""
+  LOCAL_REGISTRY_IMAGE_LATEST: $CI_REGISTRY_IMAGE:latest
+  LOCAL_REGISTRY_IMAGE_TAGGED: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
+  DOCKERHUB_IMAGE_LATEST: pztrn/taskd:latest
+  DOCKERHUB_IMAGE_TAGGED: pztrn/taskd:$CI_COMMIT_TAG
+
+stages:
+  - build
+
+before_script:
+  - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+  - docker login -u "$DOCKERHUB_USER" -p "$DOCKERHUB_PASSWORD"
+  - docker info
+
+build-local-registry-latest:
+  stage: build
+  tags:
+    - docker
+  script:
+    - docker build --pull -t $LOCAL_REGISTRY_IMAGE_LATEST .
+    - docker push $LOCAL_REGISTRY_IMAGE_LATEST
+
+build-local-registry-version:
+  stage: build
+  tags:
+    - docker
+  script:
+    - docker build --pull -t $LOCAL_REGISTRY_IMAGE_TAGGED .
+    - docker push $LOCAL_REGISTRY_IMAGE_TAGGED
+  only:
+    - tags
+
+build-dockerhub-latest:
+  stage: build
+  tags:
+    - docker
+  script:
+    - docker build --pull -t $DOCKERHUB_IMAGE_LATEST .
+    - docker push $DOCKERHUB_IMAGE_LATEST
+
+build-dockerhub-version:
+  stage: build
+  tags:
+    - docker
+  script:
+    - docker build --pull -t $DOCKERHUB_IMAGE_TAGGED .
+    - docker push $DOCKERHUB_IMAGE_TAGGED
+  only:
+    - tags
diff --git a/Dockerfile b/Dockerfile
index ace4cca..8866216 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.11
+FROM alpine:3.12
 
 COPY ./taskd.sh /usr/bin
 
@@ -24,4 +24,4 @@ ENV TASKDATA /var/taskd
 
 VOLUME ["/var/taskd"]
 EXPOSE 53589
-CMD ["/usr/bin/taskd.sh"]
\ No newline at end of file
+CMD ["/usr/bin/taskd.sh"]