diff --git a/k8s/prometheus-federation/deployments/external-dns.yml b/k8s/prometheus-federation/deployments/external-dns.yml
index 19519d50..ae8695b4 100644
--- a/k8s/prometheus-federation/deployments/external-dns.yml
+++ b/k8s/prometheus-federation/deployments/external-dns.yml
@@ -19,7 +19,7 @@ spec:
       serviceAccountName: external-dns
       containers:
       - name: external-dns
-        image: registry.opensource.zalan.do/teapot/external-dns:v0.5.17
+        image: k8s.gcr.io/external-dns/external-dns:v0.10.1
         # domain-filter is the zone we want to manage. txt-owner-id is an
         # arbitrary identifier used to track who created each entry (scoped
         # here to the cluster, in case we end up using more than one
diff --git a/k8s/prometheus-federation/deployments/kubeip.yml b/k8s/prometheus-federation/deployments/kubeip.yml
index df0d74e0..f2bdd6e3 100644
--- a/k8s/prometheus-federation/deployments/kubeip.yml
+++ b/k8s/prometheus-federation/deployments/kubeip.yml
@@ -2,12 +2,14 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: kubeip
-  namespace: default
+  namespace: kube-system
 spec:
   replicas: 1
   selector:
     matchLabels:
       app: kubeip
+  strategy:
+    type: Recreate
   template:
       metadata:
         labels:
@@ -16,7 +18,7 @@ spec:
         priorityClassName: system-cluster-critical
         containers:
         - name: "kubeip"
-          image: doitintl/kubeip:issue-34
+          image: doitintl/kubeip:v1.0.0
           imagePullPolicy: Always
           volumeMounts:
           - name: google-cloud-key
diff --git a/k8s/prometheus-federation/roles/rbac-kubeip.yml b/k8s/prometheus-federation/roles/rbac-kubeip.yml
index 7fcfc95c..959b321a 100644
--- a/k8s/prometheus-federation/roles/rbac-kubeip.yml
+++ b/k8s/prometheus-federation/roles/rbac-kubeip.yml
@@ -3,12 +3,14 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: kubeip
+  namespace: kube-system
 ---
 # Allow kubeIP to keep an eye on nodes and pods
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: kubeip
+  namespace: kube-system
 rules:
 - apiGroups: [""]
   resources: ["nodes"]