diff --git a/hiera/fqdn/zuulv3.openstack.org.yaml b/hiera/fqdn/zuulv3.openstack.org.yaml
index c1a6bd9e7e..c053a67404 100644
--- a/hiera/fqdn/zuulv3.openstack.org.yaml
+++ b/hiera/fqdn/zuulv3.openstack.org.yaml
@@ -19,7 +19,6 @@ zuul_connections:
 
   - name: 'github'
     driver: 'github'
-    sshkey: '/var/lib/zuul/ssh/id_rsa'
 
 gearman_server_ssl_cert: |
   -----BEGIN CERTIFICATE-----
diff --git a/hiera/group/zuul-executor.yaml b/hiera/group/zuul-executor.yaml
index dddd25b766..4dd7369849 100644
--- a/hiera/group/zuul-executor.yaml
+++ b/hiera/group/zuul-executor.yaml
@@ -6,3 +6,6 @@ zuul_connections:
     canonical_hostname: 'git.openstack.org'
     user: 'zuul'
     sshkey: '/var/lib/zuul/ssh/id_rsa'
+
+  - name: 'github'
+    driver: 'github'