diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b77ae456a07c1cc34d49ed0b4d271508bb78f817..1819e3e24cac27b28a001a8be5df825e2ce3d4c1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 debian_jessie_i386_deb:
    tags:
      - debian
-     - stable
+     - jessie
      - i386
    script:
      - echo "" | sudo -S apt-get -qq purge -y pd-l2ork > /dev/null || echo "couldn't purge..."
@@ -22,8 +22,8 @@ debian_jessie_i386_deb:
 debian_jessie_x86_64_deb:
    tags:
      - debian
-     - stable
-     - amd64
+     - jessie
+     - x86_64
    script:
      - echo "" | sudo -S apt-get -qq purge -y pd-l2ork > /dev/null || echo "couldn't purge..."
      - echo "" | sudo -S DEBIAN_FRONTEND=noninteractive apt-get -qq -y update > /dev/null
@@ -44,7 +44,7 @@ debian_stretch_x86_64_deb:
    tags:
      - debian
      - stretch
-     - amd64
+     - x86_64
    script:
      - echo "" | sudo -S apt-get -qq purge -y pd-l2ork > /dev/null || echo "couldn't purge..."
      - echo "" | sudo -S DEBIAN_FRONTEND=noninteractive apt-get -qq -y update > /dev/null
@@ -87,7 +87,7 @@ ubuntu_14.04_x86_64_deb:
    tags:
      - ubuntu
      - v14.04
-     - amd64
+     - x86_64
    script:
      - echo "" | sudo -S apt-get -qq purge -y pd-l2ork > /dev/null || echo "couldn't purge..."
      - echo "" | sudo -S DEBIAN_FRONTEND=noninteractive apt-get -qq -y update > /dev/null
@@ -109,7 +109,7 @@ ubuntu_16.04_x86_64_deb:
    tags:
      - ubuntu
      - v16.04
-     - amd64
+     - x86_64
    script:
      - echo "" | sudo -S apt-get -qq purge -y pd-l2ork > /dev/null || echo "couldn't purge..."
      - echo "" | sudo -S DEBIAN_FRONTEND=noninteractive apt-get -qq -y update > /dev/null
@@ -182,9 +182,8 @@ windows_i386_innosetup:
 
 raspbian_stretch_armv7l_deb:
    tags:
-     - debian
+     - raspbian
      - arm 
-     - stable
      - stretch
    script:
      - echo "" | sudo -S apt-get -qq purge -y pd-l2ork > /dev/null || echo "couldn't purge..."