diff --git a/.travis.yml b/.travis.yml
index accc3a7f..cc75436b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,19 +21,18 @@ script:
 
 after_success:
 - if [ -z "$DOCKER_USER" ]; then
-    echo "PR build, skipping Docker Hub push";
+    echo "PR build, skipping image push";
   else
-    docker tag stefanprodan/flagger:latest stefanprodan/flagger:${TRAVIS_COMMIT};
-    echo $DOCKER_PASS | docker login -u=$DOCKER_USER --password-stdin;
-    docker push stefanprodan/flagger:${TRAVIS_COMMIT};
+    docker tag stefanprodan/flagger:latest quay.io/stefanprodan/flagger:${TRAVIS_COMMIT};
+    echo $DOCKER_PASS | docker login -u=$DOCKER_USER --password-stdin quay.io;
+    docker push quay.io/stefanprodan/flagger:${TRAVIS_COMMIT};
   fi
 - if [ -z "$TRAVIS_TAG" ]; then
-    echo "Not a release, skipping Docker Hub push";
+    echo "Not a release, skipping image push";
   else
-    docker tag stefanprodan/flagger:latest stefanprodan/flagger:$TRAVIS_TAG;
-    echo $DOCKER_PASS | docker login -u=$DOCKER_USER --password-stdin;
-    docker push stefanprodan/flagger:latest;
-    docker push stefanprodan/flagger:$TRAVIS_TAG;
+    docker tag stefanprodan/flagger:latest quay.io/stefanprodan/flagger:${TRAVIS_TAG};
+    echo $DOCKER_PASS | docker login -u=$DOCKER_USER --password-stdin quay.io;
+    docker push quay.io/stefanprodan/flagger:$TRAVIS_TAG;
   fi
 - bash <(curl -s https://codecov.io/bash)
 - rm coverage.txt
diff --git a/Dockerfile b/Dockerfile
index b33e1bc4..d01737a9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.10
+FROM golang:1.11
 
 RUN mkdir -p /go/src/github.com/stefanprodan/flagger/
 
diff --git a/Makefile b/Makefile
index 437024f3..7ba1d092 100644
--- a/Makefile
+++ b/Makefile
@@ -56,10 +56,10 @@ version-up:
 
 dev-up: version-up
 	@echo "Starting build/push/deploy pipeline for $(VERSION)"
-	docker build -t stefanprodan/flagger:$(VERSION) . -f Dockerfile
-	docker push stefanprodan/flagger:$(VERSION)
+	docker build -t quay.io/stefanprodan/flagger:$(VERSION) . -f Dockerfile
+	docker push quay.io/stefanprodan/flagger:$(VERSION)
 	kubectl apply -f ./artifacts/flagger/crd.yaml
-	helm upgrade --install flagger ./charts/flagger --namespace=istio-system --set crd.create=false
+	helm upgrade -i flagger ./charts/flagger --namespace=istio-system --set crd.create=false
 
 release:
 	git tag $(VERSION)
diff --git a/artifacts/flagger/deployment.yaml b/artifacts/flagger/deployment.yaml
index f22c8b49..d7710db9 100644
--- a/artifacts/flagger/deployment.yaml
+++ b/artifacts/flagger/deployment.yaml
@@ -22,7 +22,7 @@ spec:
       serviceAccountName: flagger
       containers:
       - name: flagger
-        image: stefanprodan/flagger:0.1.0-beta.9
+        image: quay.io/stefanprodan/flagger:0.1.0-beta.9
         imagePullPolicy: Always
         ports:
         - name: http
diff --git a/charts/flagger/values.yaml b/charts/flagger/values.yaml
index baca1868..467e1844 100644
--- a/charts/flagger/values.yaml
+++ b/charts/flagger/values.yaml
@@ -1,7 +1,7 @@
 # Default values for flagger.
 
 image:
-  repository: stefanprodan/flagger
+  repository: quay.io/stefanprodan/flagger
   tag: 0.1.0-beta.9
   pullPolicy: IfNotPresent