diff --git a/autocert/examples/hello-mtls/node/hello-mtls.client.yaml b/autocert/examples/hello-mtls/node/hello-mtls.client.yaml
index 14c16fc8..917a1eb4 100644
--- a/autocert/examples/hello-mtls/node/hello-mtls.client.yaml
+++ b/autocert/examples/hello-mtls/node/hello-mtls.client.yaml
@@ -14,8 +14,8 @@ spec:
     spec:
       containers:
       - name: hello-mtls-client
-        image: hello-mtls-client-node:latest
-        imagePullPolicy: Never
+        image: sourishkrout/hello-mtls-client-node:latest
+        imagePullPolicy: IfNotPresent
         resources: {requests: {cpu: 10m, memory: 20Mi}}
         env:
         - name: HELLO_MTLS_URL
diff --git a/autocert/examples/hello-mtls/node/hello-mtls.server.yaml b/autocert/examples/hello-mtls/node/hello-mtls.server.yaml
index 1da6b602..bdc604fa 100644
--- a/autocert/examples/hello-mtls/node/hello-mtls.server.yaml
+++ b/autocert/examples/hello-mtls/node/hello-mtls.server.yaml
@@ -28,6 +28,6 @@ spec:
     spec:
       containers:
       - name: hello-mtls
-        image: hello-mtls-server-node:latest
-        imagePullPolicy: Never
+        image: sourishkrout/hello-mtls-server-node:latest
+        imagePullPolicy: IfNotPresent
         resources: {requests: {cpu: 10m, memory: 20Mi}}
diff --git a/autocert/install/02-autocert.yaml b/autocert/install/02-autocert.yaml
index f6453ca2..f25ffaf9 100644
--- a/autocert/install/02-autocert.yaml
+++ b/autocert/install/02-autocert.yaml
@@ -25,7 +25,7 @@ data:
     certLifetime: 24h
     renewer:
       name: autocert-renewer
-      image: smallstep/autocert-renewer:0.8.3
+      image: sourishkrout/autocert-renewer:dev
       resources: {requests: {cpu: 10m, memory: 20Mi}}
       imagePullPolicy: IfNotPresent
       volumeMounts:
diff --git a/autocert/renewer/Dockerfile b/autocert/renewer/Dockerfile
index 900b2f60..b0f63c45 100644
--- a/autocert/renewer/Dockerfile
+++ b/autocert/renewer/Dockerfile
@@ -5,4 +5,4 @@ ENV CRT="/var/run/autocert.step.sm/site.crt"
 ENV KEY="/var/run/autocert.step.sm/site.key"
 ENV STEP_ROOT="/var/run/autocert.step.sm/root.crt"
 
-ENTRYPOINT ["/bin/bash", "-c", "step ca renew --daemon $CRT $KEY"]
+ENTRYPOINT ["/bin/bash", "-c", "step ca renew --daemon --renew-period 2m $CRT $KEY"]