diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2a851c3..720550e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,7 +37,6 @@ test-2.7:
     - make -e push-$PYTHON_VERSION
   only:
     - tags
-    - master
     - triggers
 
 push-3.5:
@@ -54,19 +53,27 @@ push-2.7:
     VERSION: $CI_BUILD_TAG
     IMAGENAME: $CI_REGISTRY_IMAGE
 
-push-latest:
-  stage: push
+push-main:
+  <<: *image_definition
   variables:
+    PYTHON_VERSION: main
+    VERSION: $CI_BUILD_TAG
+    IMAGENAME: $CI_REGISTRY_IMAGE
+
+push-latest:
+  <<: *image_definition
+  variables:
+    PYTHON_VERSION: latest
+    VERSION: $CI_BUILD_TAG
     IMAGENAME: $CI_REGISTRY_IMAGE
-  before_script:
-    - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
-  script:
-    - make -e push-latest
   only:
     - master
+    - tags
     - triggers
 
 clean :
   stage: clean
   script:
-    - make -e clean
\ No newline at end of file
+    - make -e clean
+  only:
+    - master
\ No newline at end of file
diff --git a/Makefile b/Makefile
index f92f86e..03cde7a 100644
--- a/Makefile
+++ b/Makefile
@@ -99,7 +99,9 @@ push-latest: build-$(PYMAIN)
 	docker push '$(IMAGEWTAG)'
 
 push-%: build-%
-	docker push $(IMAGEWTAG)-python$*
+	docker push $(IMAGE):$(VERSION)-python$*
+
+push-main: push-$(PYMAIN)
 
 ci:
 	gitlab-runner exec docker --docker-volumes /var/run/docker.sock:/var/run/docker.sock --env CI_PROJECT_NAME=$(NAME) ${action}