diff --git a/inventory/host_vars/regcfp.fedorainfracloud.org b/inventory/host_vars/regcfp.fedorainfracloud.org
index 3e90f680ac..02db2558fd 100644
--- a/inventory/host_vars/regcfp.fedorainfracloud.org
+++ b/inventory/host_vars/regcfp.fedorainfracloud.org
@@ -1,5 +1,5 @@
 ---
-image: rhel7-20141015
+image: Fedora-Cloud-Base-23.x86_64-python2
 instance_type: m1.medium
 keypair: fedora-admin-20130801
 security_group: ssh-anywhere-persistent,web-80-anywhere-persistent,web-443-anywhere-persistent,default
diff --git a/playbooks/hosts/regcfp.fedorainfracloud.org.yml b/playbooks/hosts/regcfp.fedorainfracloud.org.yml
index 29dc04350d..b74fe55e46 100644
--- a/playbooks/hosts/regcfp.fedorainfracloud.org.yml
+++ b/playbooks/hosts/regcfp.fedorainfracloud.org.yml
@@ -29,12 +29,15 @@
   - name: add packages
     yum: state=present name={{ item }}
     with_items:
-    - httpd
+    - nodejs
+    - npm
     - postgresql
     - postgresql-server
-    - mod_ssl
     - wget
     - unzip
 
-  - name: enable httpd service
-    service: name=httpd enabled=yes state=started
+  - name: Clone the regcfp flock2016 branch
+    git: repo=https://github.com/puiterwijk/regcfp.git
+         dest=/srv/regcfp
+         version=flock2016
+         clone=yes update=yes