diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index d009445a..6fa1393e 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -118,6 +118,17 @@ metacpan::web::starman:
       socket_io:
           template: 'socket_io'
 
+  github-meets-cpan:
+    git_source: 'https://github.com/CPAN-API/github-meets-cpan.git'
+    git_revision: 'master'
+    vhost_bare: true
+    vhost_aliases:
+      - 'gh.metacpan.org'
+      - "gh.lo.metacpan.org"
+      - "gh.%{hostname}.metacpan.org"
+    starman_port: 5002
+    starman_workers: 1
+
 
 metacpan::web::static:
 
diff --git a/hieradata/env/dev.yaml b/hieradata/env/dev.yaml
index 00463c8e..6205588a 100644
--- a/hieradata/env/dev.yaml
+++ b/hieradata/env/dev.yaml
@@ -2,5 +2,6 @@
 
 classes:
     - metacpan::role::developer
+    - metacpan::system::mongodb
 
 metacpan::tmp_dir: '/tmp/metacpan'
diff --git a/hieradata/env/production.yaml b/hieradata/env/production.yaml
index 77732329..1d14e67f 100644
--- a/hieradata/env/production.yaml
+++ b/hieradata/env/production.yaml
@@ -30,17 +30,8 @@ metacpan::web::starman:
   metacpan-api:
     git_enable: true
     starman_workers: 14
-
   github-meets-cpan:
-    git_source: 'https://github.com/CPAN-API/github-meets-cpan.git'
-    git_revision: 'master'
     git_enable: true
-    vhost_bare: true
-    vhost_aliases:
-      - 'gh.metacpan.org'
-      - "gh.lo.metacpan.org"
-      - "gh.%{hostname}.metacpan.org"
-    starman_port: 5002
     starman_workers: 1
 
 metacpan::web::static:
diff --git a/hieradata/nodes/metacpan-dev.yaml b/hieradata/nodes/metacpan-dev.yaml
index 3b9336f1..348bf161 100644
--- a/hieradata/nodes/metacpan-dev.yaml
+++ b/hieradata/nodes/metacpan-dev.yaml
@@ -28,5 +28,8 @@ metacpan::fw_ports:
   metacpan_api:
     port: 5000
     source: '0.0.0.0/0'
+  github-meets-cpan:
+    port: 5002
+    source: '0.0.0.0/0'
 
 starman::config::plack_env: development