diff --git a/gitlab-ci-mkp.yml b/gitlab-ci-mkp.yml
index 742e3474f120941e924728a2676617de59f47af7..19877f2603aadafeda024783885f4ae9364a1ec2 100644
--- a/gitlab-ci-mkp.yml
+++ b/gitlab-ci-mkp.yml
@@ -1,6 +1,5 @@
 stages:
   - build
-  - upload
   - release
 
 variables:
@@ -11,8 +10,7 @@ variables:
 
 build:
   stage: build
-  image: gitlab.ard.de:4567/checkmk/build-mkp:latest
-  #image: "${CI_REGISTRY}/checkmk/build-mkp:latest"
+  image: "${CI_REGISTRY}/checkmk/build-mkp:latest"
   tags:
     - global-runner
   rules:
@@ -24,34 +22,13 @@ build:
     paths:
       - dist/*.mkp
 
-upload:
-  stage: upload
-  image:
-    name: curlimages/curl:latest
-    pull_policy: always # available: always, if-not-present, never
-  tags:
-    - global-runner
-  rules:
-    - if: $CI_COMMIT_TAG
-  script:
-    - |
-      curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" \
-        --upload-file dist/${CHECKMK_PLUGIN_FILENAME} "${PACKAGE_REGISTRY_URL}/${CHECKMK_PLUGIN_FILENAME}"
-
 release_job:
   image: gitlab/glab:latest
   stage: release
   tags:
     - global-runner
   script:
-    - pwd
-    - ls -la
-    - ls -la dist
-    - echo ${CHECKMK_PLUGIN_FILENAME}
-    - echo "${PACKAGE_REGISTRY_URL}/${CHECKMK_PLUGIN_FILENAME}"
     - glab config set check_update false --global
     - glab auth login --job-token $CI_JOB_TOKEN --hostname $CI_SERVER_HOST --api-protocol $CI_SERVER_PROTOCOL
     - GITLAB_HOST=$CI_SERVER_URL glab release list -R $CI_PROJECT_PATH
-    - glab release create $CI_COMMIT_TAG -T $CI_COMMIT_TAG --notes "${CI_COMMIT_TAG_MESSAGE}" -r "${CI_COMMIT_SHA}" -n "Release ${CI_COMMIT_TAG}"
-    - glab release create $CI_COMMIT_TAG --assets-links="[{\"name\":\"$CHECKMK_PLUGIN_FILENAME\",\"url\":\"${PACKAGE_REGISTRY_URL}/${CHECKMK_PLUGIN_FILENAME}\",\"link_type\":\"package\"}]"
-    #- glab release create $CI_COMMIT_TAG -T $CI_COMMIT_TAG --notes "${CI_COMMIT_TAG_MESSAGE}" ./dist/*.mkp
+    - glab release create "${CI_COMMIT_TAG}" -T "${CI_COMMIT_TAG}" --notes "${CI_COMMIT_TAG_MESSAGE}" -r "${CI_COMMIT_SHA}" -n "Release ${CI_COMMIT_TAG}" --assets-links="[{\"name\":\"$CHECKMK_PLUGIN_FILENAME\",\"url\":\"${PACKAGE_REGISTRY_URL}/${CHECKMK_PLUGIN_FILENAME}\",\"link_type\":\"package\"}]"