diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6e606e5..21f38d9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -75,10 +75,7 @@ debian:
   script:
     - mk-build-deps -i -r -t "apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y"
     - PACKAGE_VERSION="$CI_COMMIT_TAG"
-    # Workaround for GitLab CI bug (see https://gitlab.com/gitlab-org/gitlab-ce/issues/61007)
-    # On issue fix, replace with:
-    # - PACKAGE_VERSION="${PACKAGE_VERSION:-$(git describe --abbrev=8 2>/dev/null | tr '-' '+' | cut -c '2-' || true)}"
-    - PACKAGE_VERSION="${PACKAGE_VERSION:-0.0+1+g$CI_COMMIT_SHORT_SHA}"
+    - PACKAGE_VERSION="${PACKAGE_VERSION:-$(git describe --abbrev=8 2>/dev/null | tr '-' '+' | cut -c '2-' || true)}"
     - PACKAGE_VERSION="${PACKAGE_VERSION#v}"
     - |
       [ -z "$PACKAGE_VERSION" ] || {