diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f0b8787980a9604e7307e94ed3dfaac220455f89..ccbb9f1537e19280df912ff6415b1c7dcba349df 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,7 +42,7 @@ skip_ci:
   script:
     - echo 1
 
-.rust_stable_lin64: &rust_stable_lin64
+.rust_stable_lin64:
   only:
     <<: *ci_only_conditions
   except:
@@ -55,19 +55,7 @@ skip_ci:
     - rustup show
     - rustc --version && cargo --version
 
-.rust_nightly_lin64: &rust_nightly_lin64
-  only:
-    <<: *ci_only_conditions
-  except:
-    <<: *ci_except_conditions
-  image: rustlang/rust:nightly
-  tags:
-    - redshift-docker-runner
-  before_script:
-    - export PATH="$HOME/.cargo/bin:$PATH"
-    - rustc --version && cargo --version
-
-.rust_stable_armv7: &rust_stable_armv7
+.rust_stable_armv7:
   only:
     <<: *ci_only_conditions
   except:
@@ -78,7 +66,7 @@ skip_ci:
   before_script:
     - rustc --version && cargo --version
 
-.rust_stable_win64: &rust_stable_win64
+.rust_stable_win64:
   only:
     <<: *ci_only_conditions
   except:
@@ -90,7 +78,7 @@ skip_ci:
     - rustc --version && cargo --version
 
 fmt:
-  <<: *rust_stable_lin64
+  extends: .rust_stable_lin64
   stage: fmt
   before_script:
     - cargo fmt -- --version
@@ -98,7 +86,7 @@ fmt:
     - cargo fmt -- --check
     
 tests:linux64:stable:
-  <<: *rust_stable_lin64
+  extends: .rust_stable_lin64
   stage: tests
   tags:
     - redshift-docker-runner
@@ -109,14 +97,11 @@ tests:linux64:stable:
     - cargo test --all -- --ignored
 
 tests:arm-v7-:stable:
-  <<: *rust_stable_armv7
+  extends: .rust_stable_armv7
   stage: tests
   allow_failure: true
   when: manual
-  only:
-    <<: *ci_only_conditions
   except:
-    <<: *ci_except_conditions
     refs:
       - tags
   script: 
@@ -125,7 +110,7 @@ tests:arm-v7-:stable:
     - cargo test --all --target=armv7-unknown-linux-gnueabihf
 
 tests:arm-v7:stable:
-  <<: *rust_stable_armv7
+  extends: .rust_stable_armv7
   stage: tests
   only:
     - tags
@@ -135,7 +120,7 @@ tests:arm-v7:stable:
     - cargo test --all --target=armv7-unknown-linux-gnueabihf
 
 tests:win64:stable:
-  <<: *rust_stable_win64
+  extends: .rust_stable_win64
   stage: tests
   script: 
     - cd bin/dunitrust-server
@@ -161,7 +146,7 @@ tests:win64:stable:
     - cargo test --package durs-wot --target=x86_64-pc-windows-gnu
 
 clippy:
-  <<: *rust_stable_lin64
+  extends: .rust_stable_lin64
   before_script:
     - cargo clippy -- -V
   stage: clippy
@@ -169,7 +154,7 @@ clippy:
     - cargo clippy --all -- -D warnings --verbose
 
 publish:crate:
-  <<: *rust_stable_lin64
+  extends: .rust_stable_lin64
   stage: publish_crate
   when: manual
   allow_failure: true
@@ -182,13 +167,10 @@ publish:crate:
     - cargo publish
 
 package:test:linux64:
-  <<: *rust_stable_lin64
+  extends: .rust_stable_lin64
   stage: package
   when: manual
-  only:
-    <<: *ci_only_conditions
   except:
-    <<: *ci_except_conditions
     refs:
       - tags
   script:
@@ -200,10 +182,7 @@ package:test:linux64:
 
 package:test:docker-test-image:
   stage: package
-  only:
-    <<: *ci_only_conditions
   except:
-    <<: *ci_except_conditions
     refs:
       - dev
       - tags
@@ -228,11 +207,9 @@ package:test:docker-test-image:
 package:test:docker:
   stage: package
   only:
-    <<: *ci_only_conditions
     refs:
       - dev
   except:
-    <<: *ci_except_conditions
     refs:
       - tags
   image: docker:18.06
@@ -251,13 +228,10 @@ package:test:docker:
     - docker push "$CI_REGISTRY_IMAGE:dev"
 
 package:test:armv7:
-  <<: *rust_stable_armv7
+  extends: .rust_stable_armv7
   stage: package
   when: manual
-  only:
-    <<: *ci_only_conditions
   except:
-    <<: *ci_except_conditions
     refs:
       - tags
   script:
@@ -268,13 +242,10 @@ package:test:armv7:
     expire_in: 1 weeks
 
 package:test:win64:
-  <<: *rust_stable_win64
+  extends: .rust_stable_win64
   stage: package
   when: manual
-  only:
-    <<: *ci_only_conditions
   except:
-    <<: *ci_except_conditions
     refs:
       - tags
   script:
@@ -285,7 +256,7 @@ package:test:win64:
     expire_in: 1 weeks
 
 package:prod:linux64:
-  <<: *rust_stable_lin64
+  extends: .rust_stable_lin64
   stage: package
   only:
     - tags
@@ -313,7 +284,7 @@ package:prod:docker:
     - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
 
 package:prod:armv7:
-  <<: *rust_stable_armv7
+  extends: .rust_stable_armv7
   stage: package
   only:
     - tags
@@ -325,7 +296,7 @@ package:prod:armv7:
     expire_in: 2 weeks
 
 package:prod:win64:
-  <<: *rust_stable_win64
+  extends: .rust_stable_win64
   only:
     - tags
   stage: package
@@ -336,24 +307,13 @@ package:prod:win64:
       - work/bin/
     expire_in: 2 weeks
 
-.release_jobs: &release_jobs
-  only:
-    - tags
-  image: rdadev/jinja2:py3.6
-  tags:
-    - redshift-docker-runner
-  script:
-    - python3 .gitlab/releaser
-
 pages:
-  <<: *rust_stable_lin64
+  extends: .rust_stable_lin64
   stage: publish_doc
   only:
-    <<: *ci_only_conditions
     refs:
       - dev
   except:
-    <<: *ci_except_conditions
     refs:
       - tags
   script:
@@ -365,15 +325,24 @@ pages:
     paths:
       - public
 
+.release_jobs:
+  only:
+    - tags
+  image: rdadev/jinja2:py3.6
+  tags:
+    - redshift-docker-runner
+  script:
+    - python3 .gitlab/releaser
+
 prerelease:
-  <<: *release_jobs
+  extends: .release_jobs
   stage: prerelease
   variables:
     RELEASE_BIN_DIR: work/bin/
     SOURCE_EXT: '["tar.gz", "zip"]'
 
 release:
-  <<: *release_jobs
+  extends: .release_jobs
   stage: release
   allow_failure: false
   when: manual