diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4560c42..197c77f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,7 +2,9 @@ version: 2
 jobs:
   build:
     environment:
-      IMAGE_NAME: wastrachan/flexget
+      REPO_NAME: "wastrachan"
+      IMAGE_NAME: "flexget"
+      IMAGE_VERSION: "3.1.26"
     docker:
       - image: docker:latest
     steps:
@@ -15,13 +17,16 @@ jobs:
       - run:
           name: Build image
           command: |
-            docker build -t $IMAGE_NAME:latest .
+            docker build --build-arg FLEXGET_VERSION=$IMAGE_VERSION -t $IMAGE_NAME .
+            docker tag $IMAGE_NAME $REPO_NAME/$IMAGE_NAME:$IMAGE_VERSION
+            docker tag $IMAGE_NAME $REPO_NAME/$IMAGE_NAME:latest
       - deploy:
           name: Publish image
           command: |
             if [ "${CIRCLE_BRANCH}" == "master" ]; then
               echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
-              docker push $IMAGE_NAME:latest
+              docker push $REPO_NAME/$IMAGE_NAME:$IMAGE_VERSION
+              docker push $REPO_NAME/$IMAGE_NAME:latest
             fi
 
 workflows:
@@ -32,12 +37,3 @@ workflows:
           filters:
             branches:
               only: master
-  nightly:
-    triggers:
-      - schedule:
-          cron: "0 0 * * 1,4"
-          filters:
-            branches:
-              only: master
-    jobs:
-      - build