diff --git a/Dockerfile.python b/Dockerfile.python
index 208b73f..2397f9b 100644
--- a/Dockerfile.python
+++ b/Dockerfile.python
@@ -1,3 +1,3 @@
-FROM python:3.6
+FROM python:3.7
 
 ENV PATH="/root/.local/bin:$PATH"
diff --git a/Makefile b/Makefile
index 26c5670..4846bcf 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,8 @@ help:
 	@echo "        IMPORTANT: this wipes any existing data in your local database."
 	@echo "    build"
 	@echo "        Build the production containers."
+	@echo "    secret"
+	@echo "        Generate a random base64 encoded secret"
 
 setup:
 	@docker-compose build
@@ -17,11 +19,17 @@ setup:
 	@docker-compose run homepage pip install --user -r requirements.txt
 	@echo "Successfully built containers and installed dependencies."
 	@echo "If this is your initial setup, you can run 'make bootstrap' next"
-	@echo "to create the needed local keys and seed the database."
+	@echo "to create seed the database."
 
 bootstrap:
 	@echo "Bootstrapping Server service ..."
 	@docker-compose run server make bootstrap
+	@echo ""
+	@echo "You can now log into the development backend using the following credentials:"
+	@echo ""
+	@echo "Email: develop@offen.dev"
+	@echo "Password: develop"
+	@echo ""
 
 DOCKER_IMAGE_TAG ?= latest
 
diff --git a/build/proxy/Dockerfile b/build/proxy/Dockerfile
index 3e61c01..d31d945 100644
--- a/build/proxy/Dockerfile
+++ b/build/proxy/Dockerfile
@@ -40,7 +40,7 @@ RUN cp -a /code/deps/node_modules /code/vault/
 ENV NODE_ENV production
 RUN npm run build
 
-FROM nikolaik/python-nodejs:python3.6-nodejs10 as homepage
+FROM nikolaik/python-nodejs:python3.7-nodejs10 as homepage
 
 ARG siteurl
 ENV SITEURL=$siteurl
diff --git a/homepage/pelicanconf.py b/homepage/pelicanconf.py
index 9a786bf..2008b43 100644
--- a/homepage/pelicanconf.py
+++ b/homepage/pelicanconf.py
@@ -1,8 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*- #
-from __future__ import unicode_literals
-import logging
-
 # If your site is available via HTTPS, make sure SITEURL begins with https://
 RELATIVE_URLS = False
 
@@ -22,7 +17,6 @@ AUTHOR_FEED_RSS = None
 # pagination
 DEFAULT_PAGINATION = False
 
-
 THEME = './theme'
 
 # Delete the output directory before generating new files.
@@ -43,3 +37,5 @@ DIRECT_TEMPLATES = []
 GITHUB_ORG = 'https://github.com/offen'
 CONTACT_EMAIL = 'mail@offen.dev'
 PATREON_URL = 'https://www.patreon.com/bePatron?u=21484999'
+
+OFFEN_ACCOUNT_ID = '9b63c4d8-65c0-438c-9d30-cc4b01173393'
diff --git a/homepage/publishconf.py b/homepage/publishconf.py
index 16e9042..67107c4 100644
--- a/homepage/publishconf.py
+++ b/homepage/publishconf.py
@@ -1,7 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*- #
-from __future__ import unicode_literals
-
 # This file is only used if you use `make publish` or
 # explicitly specify it as your config file.
 
@@ -21,4 +17,4 @@ DELETE_OUTPUT_DIRECTORY = True
 
 PLUGINS += ['optimize_images']
 
-OFFEN_ACCOUNT_ID = "5ec8345a-2a45-4eb9-92e5-8d9e5684db58"
+OFFEN_ACCOUNT_ID = '5ec8345a-2a45-4eb9-92e5-8d9e5684db58'