diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5df1f8e0556d2bb25f985906d0cf593282dfd88e..f3a5ecbe298105e23fb0a1ac767dd47a8a058126 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,6 @@
 stages:
   - buildbob
   - testbob
-  - wheelsbob
 
 # ---------
 # Templates
@@ -22,6 +21,7 @@ stages:
     - ./ci/before_build.sh 1 buildout-bob.cfg
   script:
     - ./ci/build.sh buildout-bob.cfg
+    - ./ci/wheels_dependencies.sh ${WHEEL_TAG}
   after_script:
     - ./ci/after_build.sh
   artifacts:
@@ -42,16 +42,6 @@ stages:
     - ./ci/after_test.sh
     
 
-# Template for the wheel uploading stage
-# Needs to run against all combinations of python and operating systems
-.wheels_template: &wheels_job
-  stage: wheelsbob
-  environment: intranet
-  only:
-    - new_ci
-    - /^v\d+\.\d+\.\d+([abc]\d*)?$/  # PEP-440 compliant version (tags)
-  script:
-    - ./wheels_dependencies.sh
 
 # -------------
 # Build Targets
@@ -72,12 +62,3 @@ test_linux_27:
     - build_linux_27
   tags:
     - conda-linux
-    
-wheels_linux_27:
-  <<: *wheels_job
-  variables: *linux_27_build_variables
-  dependencies:
-    - build_linux_27
-  tags:
-    - conda-linux
-