diff --git a/Dockerfile b/Dockerfile
index 58609f58..aef9ef2e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@ RUN apk add --no-cache libpng libpng-dev zlib zlib-dev \
   && git checkout 543c1d23ac9322f4f03c7fb6612ea7d026d44ac0 \
   && make
 
-FROM docker.io/alpine:3.10
+FROM docker.io/alpine:3.11
 
 ENV UID=1337 \
     GID=1337 \
@@ -33,7 +33,6 @@ RUN apk add --no-cache --virtual .build-deps \
       python3-dev \
       libffi-dev \
       build-base \
-      git \
   && apk add --no-cache \
       py3-virtualenv \
       py3-pillow \
@@ -52,7 +51,7 @@ RUN apk add --no-cache --virtual .build-deps \
         py3-markupsafe \
       #moviepy
         py3-decorator \
-        #py3-tqdm \
+        py3-tqdm \
         py3-requests \
         #imageio
           py3-numpy \
diff --git a/mautrix_telegram/get_version.py b/mautrix_telegram/get_version.py
index 8dd748e5..0dd6bde8 100644
--- a/mautrix_telegram/get_version.py
+++ b/mautrix_telegram/get_version.py
@@ -1,4 +1,5 @@
 import subprocess
+import shutil
 import os
 
 from . import __version__
@@ -15,7 +16,7 @@ def run(cmd):
     return subprocess.check_output(cmd, stderr=subprocess.DEVNULL, env=cmd_env)
 
 
-if os.path.exists(".git"):
+if os.path.exists(".git") and shutil.which("git"):
     try:
         git_revision = run(["git", "rev-parse", "HEAD"]).strip().decode("ascii")
         git_revision_url = f"https://github.com/tulir/mautrix-telegram/commit/{git_revision}"
@@ -26,15 +27,20 @@ if os.path.exists(".git"):
 
     try:
         git_tag = run(["git", "describe", "--exact-match", "--tags"]).strip().decode("ascii")
-        git_tag_url = f"https://github.com/tulir/mautrix-telegram/releases/tag/{git_tag}"
     except (subprocess.SubprocessError, OSError):
         git_tag = None
-        git_tag_url = None
+elif os.environ.get("CI_SERVER", "no") == "yes":
+    git_revision = os.environ["CI_COMMIT_SHA"]
+    git_revision_url = f"https://github.com/tulir/mautrix-telegram/commit/{git_revision}"
+    git_revision = git_revision[:8]
+    git_tag = os.environ.get("CI_COMMIT_TAG", None)
 else:
     git_revision = "unknown"
     git_revision_url = None
     git_tag = None
-    git_tag_url = None
+
+git_tag_url = (f"https://github.com/tulir/mautrix-telegram/releases/tag/{git_tag}"
+               if git_tag else None)
 
 if git_tag and __version__ == git_tag[1:].replace("-", ""):
     version = __version__