diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fd895d6..beb864f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,7 @@ stages:
   - build
   - test
   - lint
+  - release
   - deploy
 
 variables:
@@ -25,4 +26,5 @@ include:
   - local: '/gitlab-ci/build.yml'
   - local: '/gitlab-ci/test.yml'
   - local: '/gitlab-ci/lint.yml'
+  - local: '/gitlab-ci/release.yml'
   - local: '/gitlab-ci/deploy.yml'
diff --git a/gitlab-ci/build.yml b/gitlab-ci/build.yml
index 4d9854d..c8df615 100644
--- a/gitlab-ci/build.yml
+++ b/gitlab-ci/build.yml
@@ -5,7 +5,3 @@ static:
     - npm install
   script:
     - npm run build
-  only:
-    refs:
-      - development
-      - merge_requests
diff --git a/gitlab-ci/deploy.yml b/gitlab-ci/deploy.yml
index 05365df..0fe3ce4 100644
--- a/gitlab-ci/deploy.yml
+++ b/gitlab-ci/deploy.yml
@@ -4,11 +4,13 @@ deploy:
   environment:
     name: production
     url: rss.fudiggity.nl
+  rules:
+    - if: $CI_COMMIT_TAG
   before_script:
     - pip install ansible --quiet
-    - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@git.fudiggity.nl/sonny/ansible-playbooks.git deployment
+    - git clone https://git.fudiggity.nl/sonny/newsreader.git deployment
     - mkdir /root/.ssh
-    - echo "192.168.178.63 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILbtcdgJBhVCKsO88cV19EYefDTopdYejEQCp1pYr1Ga" > /root/.ssh/known_hosts
+    - echo "$DEPLOY_HOST_KEY" > /root/.ssh/known_hosts
     - echo "$DEPLOY_KEY" > deployment/deploy_key && chmod 0600 deployment/deploy_key
     - mkdir /root/.vaults
     - echo "$VAULT_PASSWORD" > /root/.vaults/newsreader && chmod 0600 /root/.vaults/newsreader
@@ -20,5 +22,3 @@ deploy:
       --user ansible
       --private-key deployment/deploy_key
       --vault-password-file /root/.vaults/newsreader
-  only:
-    - master
diff --git a/gitlab-ci/release.yml b/gitlab-ci/release.yml
new file mode 100644
index 0000000..cdc3f6f
--- /dev/null
+++ b/gitlab-ci/release.yml
@@ -0,0 +1,10 @@
+release:
+  stage: release
+  image: registry.gitlab.com/gitlab-org/release-cli:latest
+  rules:
+    - if: $CI_COMMIT_TAG
+  script:
+    - echo 'running release_job'
+  release:
+    name: 'Release $CI_COMMIT_TAG'
+    ref: '$CI_COMMIT_TAG'