diff --git a/.githooks/post-commit b/.githooks/post-commit
index fffb01be78319dd66c2bf1f1c1c956d94c4ec232..cbe785243a890c3ff11b7d1926246a9aff08a01e 100644
--- a/.githooks/post-commit
+++ b/.githooks/post-commit
@@ -1,4 +1,8 @@
 #!/bin/bash
-mkdir .build-config
-git rev-list --count integration > .build-config/git-commit-count
-git describe --all --long > .build-config/git-commit-version
\ No newline at end of file
+
+mkdir -p .build-config
+
+CI_COMMIT_REF_NAME=`git rev-parse --abbrev-ref HEAD`
+CI_COMMIT_SHA=`git rev-parse HEAD`
+
+echo $CI_COMMIT_REF_NAME"-"$CI_COMMIT_SHA > .build-config/git-commit-ref
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e72804726e15e3f0a4c45cf7af09f5535303ff02..012667de5cd6d2ce0d87fdd9488e47b22228c168 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,13 +1,15 @@
 variables:
-  TEST_PACKAGE_NAME: clmctest-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA.tar.gz
+  TEST_PACKAGE_NAME: clmctest-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA-.tar.gz
 
 stages:  
   - build
   - test
-    
+
 build:tests:
   stage: build
   script:
+    - mkdir -p .build-config
+    - echo CI_COMMIT_REF_NAME-$CI_COMMIT_SHA > ./build-config/git-commit-ref  
     - python setup.py sdist --dist-dir=build
     - echo $TEST_PACKAGE_NAME
 
diff --git a/setup.py b/setup.py
index 7eb4dc603a0e6bef515aabd74442eab2f690111d..ebec626a88ba245d8dc1ad422763bd93fab9102c 100644
--- a/setup.py
+++ b/setup.py
@@ -6,14 +6,12 @@ def read(fname):
 
 setup(
     name = "clmctest",
-    #version = read('.build-config/git-commit-version'),
-    version = "SNAPSHOT",
+    version = read('.build-config/git-commit-ref'),
     author = "Michael Boniface",
     author_email = "mjb@it-innovation.soton.ac.uk",
     description = "FLAME CLMC Testing Module",
     license = "license",
-    keywords = "example documentation",
-    url = "http://packages.python.org/an_example_pypi_project",
+    keywords = "FLAME CLMC test",
     packages=find_packages(exclude=["services"]),
     include_package_data=True,
     package_data={'': ['*.yml', '*.sh']},