diff --git a/Dockerfile b/Dockerfile
index 068566d9..e9dca4f0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,6 +28,7 @@ RUN dnf install -y \
     && dnf autoremove -y \
     && dnf clean all \
     && mkdir /tmp/module_build_service/
+    && mkdir /etc/module-build-service/
 COPY . /tmp/module_build_service/
 WORKDIR /tmp/module_build_service/
 RUN python setup.py develop
diff --git a/Vagrantfile b/Vagrantfile
index 3ad6a742..96fb93b6 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -26,6 +26,7 @@ $script = <<SCRIPT
         systemd-devel
     systemctl enable fedmsg-relay
     systemctl start fedmsg-relay
+    mkdir /etc/module-build-service/
     cd /tmp/module_build_service
     python setup.py develop
     mbs-upgradedb
diff --git a/module_build_service/manage.py b/module_build_service/manage.py
index b8558a7c..a02b7a4c 100644
--- a/module_build_service/manage.py
+++ b/module_build_service/manage.py
@@ -151,7 +151,7 @@ def build_module_locally(url):
 
 
 @manager.command
-def gendevfedmsgcert(pki_dir='/opt/module_build_service/pki', force=False):
+def gendevfedmsgcert(pki_dir='/etc/module_build_service', force=False):
     """
     Creates a CA, a certificate signed by that CA, and generates a CRL.
     """