diff --git a/.drone.yml b/.drone.yml
index 70d4a8e..01eb949 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -12,12 +12,16 @@ steps:
   - name: go-build
     image: cache.coadcorp.com/library/golang
     commands:
-      - XTEVE_VERSION="$(head -n 1 changelog-beta.md | cut -d\" \" -f2)"
+      - XTEVE_VERSION="$(head -n 1 changelog-beta.md)"
+      - XTEVE_VERSION="${XTEVE_VERSION#\#\#\#\# }"
+      - XTEVE_VERSION="${XTEVE_VERSION%% *}"
       - XTEVE_VERSION="${XTEVE_VERSION%-beta}"
-      - SOURCE_VERSION="$(grep -m1 \"Version = \" xteve.go | cut -d\"\\\"\" -f2)"
+      - SOURCE_VERSION_LINE="$(grep -m1 'Version = ' xteve.go)"
+      - SOURCE_VERSION="${SOURCE_VERSION_LINE#*\"}"
+      - SOURCE_VERSION="${SOURCE_VERSION%%\"*}"
       - test -n "${XTEVE_VERSION}" || (echo "Could not parse version from changelog-beta.md" && exit 1)
       - test -n "${SOURCE_VERSION}" || (echo "Could not parse source version from xteve.go" && exit 1)
-      - 'test "${SOURCE_VERSION}" = "${XTEVE_VERSION}" || (echo "Version mismatch: changelog=${XTEVE_VERSION} source=${SOURCE_VERSION}" && exit 1)'
+      - 'test "${SOURCE_VERSION}" = "${XTEVE_VERSION}" || (echo "Version mismatch changelog=${XTEVE_VERSION} source=${SOURCE_VERSION}" && exit 1)'
       - echo "Building xTeVe version ${XTEVE_VERSION} from changelog-beta.md"
       - go build -v -ldflags "-X main.Version=${XTEVE_VERSION}" ./...