diff --git a/Dockerfile b/Dockerfile
index 725e92a..fba2043 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,10 @@
 FROM quay.io/vektorcloud/glibc:latest
 
-RUN ctop_url=$(wget -q -O - https://api.github.com/repos/bcicen/ctop/releases/latest | grep 'browser_' | cut -d\" -f4 |grep 'linux-amd64') && \
-    wget -q $ctop_url -O /ctop && \
+ARG CTOP_VERSION=0.4.1
+ENV CTOP_URL https://github.com/bcicen/ctop/releases/download/v${CTOP_VERSION}/ctop-${CTOP_VERSION}-linux-amd64
+
+RUN echo $CTOP_URL && \
+    wget -q $CTOP_URL -O /ctop && \
     chmod +x /ctop
 
 ENTRYPOINT ["/ctop"]
diff --git a/circle.yml b/circle.yml
index 5b50097..1d1f301 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,15 +1,18 @@
 machine:
   services:
     - docker
+  environment:
+    VERSION: $(cat VERSION)
+    IMAGE_NAME: quay.io/vektorlab/ctop
 
 dependencies:
   override:
     - docker info
     - |
       if [[ "$CIRCLE_BRANCH" == "master" ]]; then
-        docker build -t quay.io/vektorlab/ctop:latest .
+        docker build --build-arg CTOP_VERSION=${VERSION} -t ${IMAGE_NAME}:latest .
       else
-        docker build -t quay.io/vektorlab/ctop:${CIRCLE_BRANCH} .
+        docker build --build-arg CTOP_VERSION=${VERSION} -t ${IMAGE_NAME}:${CIRCLE_BRANCH} .
       fi
 
 test:
@@ -20,5 +23,6 @@ deployment:
   hub:
     branch: master
     commands:
+      - docker tag ${IMAGE_NAME}:latest ${IMAGE_NAME}:${VERSION}
       - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS quay.io
-      - docker push quay.io/vektorlab/ctop:latest
+      - docker push ${IMAGE_NAME}
diff --git a/main.go b/main.go
index 693abee..44a0a0e 100644
--- a/main.go
+++ b/main.go
@@ -25,6 +25,9 @@ var (
 func main() {
 	defer panicExit()
 
+	// init global config
+	config.Init()
+
 	// parse command line arguments
 	var versionFlag = flag.Bool("v", false, "output version information and exit")
 	var helpFlag = flag.Bool("h", false, "display this help dialog")
@@ -51,9 +54,6 @@ func main() {
 	}
 	defer ui.Close()
 
-	// init global config
-	config.Init()
-
 	// override default config values with command line flags
 	if *filterFlag != "" {
 		config.Update("filterStr", *filterFlag)