diff --git a/Dockerfile-canary b/Dockerfile-canary
index dbe00f7..6401e10 100644
--- a/Dockerfile-canary
+++ b/Dockerfile-canary
@@ -2,44 +2,58 @@ FROM ansibleplaybookbundle/apb-base:canary
 # MAINTAINER {{ $MAINTAINER }}
 
 LABEL "com.redhat.apb.spec"=\
-"IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj\
-IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKIyBTaGFyZWQgUGFyYW1ldGVycwojIyMjIyMjIyMjIyMj\
-IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj\
-IyMjIyMjIyMjIwpfcDogJl9wCiAgLSBuYW1lOiBwb3N0Z3Jlc3FsX2RhdGFiYXNlCiAgICBkZWZh\
-dWx0OiBhZG1pbgogICAgdHlwZTogc3RyaW5nCiAgICB0aXRsZTogUG9zdGdyZVNRTCBEYXRhYmFz\
-ZSBOYW1lCiAgICBwYXR0ZXJuOiAiXlthLXpBLVpfXVthLXpBLVowLTlfXSokIgogICAgcmVxdWly\
-ZWQ6IHRydWUKICAtIG5hbWU6IHBvc3RncmVzcWxfdXNlcgogICAgZGVmYXVsdDogYWRtaW4KICAg\
-IHRpdGxlOiBQb3N0Z3JlU1FMIFVzZXIKICAgIHR5cGU6IHN0cmluZwogICAgbWF4bGVuZ3RoOiA2\
-MwogICAgcGF0dGVybjogIl5bYS16QS1aX11bYS16QS1aMC05X10qJCIKICAgIHJlcXVpcmVkOiB0\
-cnVlCiAgLSBuYW1lOiBwb3N0Z3Jlc3FsX3Bhc3N3b3JkCiAgICB0eXBlOiBzdHJpbmcKICAgIHRp\
-dGxlOiBQb3N0Z3JlU1FMIFBhc3N3b3JkCiAgICBkaXNwbGF5X3R5cGU6IHBhc3N3b3JkCiAgICBw\
-YXR0ZXJuOiAiXlthLXpBLVowLTlffiFAIyQlXiYqKCktPTw+LC4/Ozp8XSskIgogICAgcmVxdWly\
-ZWQ6IHRydWUKICAtIG5hbWU6IHBvc3RncmVzcWxfdmVyc2lvbgogICAgZGVmYXVsdDogJzkuNicK\
-ICAgIGVudW06IFsnOS42JywgJzkuNScsICc5LjQnXQogICAgdHlwZTogZW51bQogICAgdGl0bGU6\
-IFBvc3RncmVTUUwgVmVyc2lvbgogICAgcmVxdWlyZWQ6IHRydWUKICAgIHVwZGF0YWJsZTogdHJ1\
-ZQojIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj\
-IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwp2ZXJzaW9uOiAxLjAKbmFtZTogcG9zdGdyZXNxbC1h\
-cGIKZGVzY3JpcHRpb246IFNDTCBQb3N0Z3JlU1FMIGFwYiBpbXBsZW1lbnRhdGlvbgpiaW5kYWJs\
-ZTogdHJ1ZQphc3luYzogb3B0aW9uYWwKdGFnczoKICAtIGRhdGFiYXNlCiAgLSBwb3N0Z3Jlc3Fs\
-Cm1ldGFkYXRhOgogIGRvY3VtZW50YXRpb25Vcmw6IGh0dHBzOi8vd3d3LnBvc3RncmVzcWwub3Jn\
-L2RvY3MvCiAgbG9uZ0Rlc2NyaXB0aW9uOiBBbiBhcGIgdGhhdCBkZXBsb3lzIHBvc3RncmVzcWwg\
-OS40LCA5LjUsIG9yIDkuNi4KICBkZXBlbmRlbmNpZXM6CiAgICAtICdyZWdpc3RyeS5hY2Nlc3Mu\
-cmVkaGF0LmNvbS9yaHNjbC9wb3N0Z3Jlc3FsLTk0LXJoZWw3JwogICAgLSAncmVnaXN0cnkuYWNj\
-ZXNzLnJlZGhhdC5jb20vcmhzY2wvcG9zdGdyZXNxbC05NS1yaGVsNycKICAgIC0gJ3JlZ2lzdHJ5\
-LmFjY2Vzcy5yZWRoYXQuY29tL3Joc2NsL3Bvc3RncmVzcWwtOTYtcmhlbDcnCiAgZGlzcGxheU5h\
-bWU6IFBvc3RncmVTUUwgKEFQQikKICBjb25zb2xlLm9wZW5zaGlmdC5pby9pY29uQ2xhc3M6IGlj\
-b24tcG9zdGdyZXNxbAogIHByb3ZpZGVyRGlzcGxheU5hbWU6ICJSZWQgSGF0LCBJbmMuIgpwbGFu\
-czoKICAtIG5hbWU6IGRldgogICAgZGVzY3JpcHRpb246IEEgc2luZ2xlIERCIHNlcnZlciB3aXRo\
-IG5vIHN0b3JhZ2UKICAgIGZyZWU6IHRydWUKICAgIG1ldGFkYXRhOgogICAgICBkaXNwbGF5TmFt\
-ZTogRGV2ZWxvcG1lbnQKICAgICAgbG9uZ0Rlc2NyaXB0aW9uOiBUaGlzIHBsYW4gcHJvdmlkZXMg\
-YSBzaW5nbGUgbm9uLUhBIFBvc3RncmVTUUwgc2VydmVyIHdpdGhvdXQgcGVyc2lzdGVudCBzdG9y\
-YWdlCiAgICAgIGNvc3Q6ICQwLjAwCiAgICBwYXJhbWV0ZXJzOiAqX3AKICAgIHVwZGF0ZXNfdG86\
-CiAgICAgIC0gcHJvZAogIC0gbmFtZTogcHJvZAogICAgZGVzY3JpcHRpb246IEEgc2luZ2xlIERC\
-IHNlcnZlciB3aXRoIHBlcnNpc3RlbnQgc3RvcmFnZQogICAgZnJlZTogdHJ1ZQogICAgbWV0YWRh\
-dGE6CiAgICAgIGRpc3BsYXlOYW1lOiBQcm9kdWN0aW9uCiAgICAgIGxvbmdEZXNjcmlwdGlvbjog\
-VGhpcyBwbGFuIHByb3ZpZGVzIGEgc2luZ2xlIG5vbi1IQSBQb3N0Z3JlU1FMIHNlcnZlciB3aXRo\
-IHBlcnNpc3RlbnQgc3RvcmFnZQogICAgICBjb3N0OiAkMC4wMAogICAgcGFyYW1ldGVyczogKl9w\
-CiAgICB1cGRhdGVzX3RvOgogICAgICAtIGRldgo="
+"LS0tCgp2ZXJzaW9uOiAxLjAKbmFtZTogcG9zdGdyZXNxbC1hcGIKZGVzY3JpcHRpb246IFNDTCBQ\
+b3N0Z3JlU1FMIGFwYiBpbXBsZW1lbnRhdGlvbgpiaW5kYWJsZTogdHJ1ZQphc3luYzogb3B0aW9u\
+YWwKdGFnczoKICAtIGRhdGFiYXNlCiAgLSBwb3N0Z3Jlc3FsCm1ldGFkYXRhOgogIGRvY3VtZW50\
+YXRpb25Vcmw6IGh0dHBzOi8vd3d3LnBvc3RncmVzcWwub3JnL2RvY3MvCiAgbG9uZ0Rlc2NyaXB0\
+aW9uOiBBbiBhcGIgdGhhdCBkZXBsb3lzIHBvc3RncmVzcWwgOS40LCA5LjUsIG9yIDkuNi4KICBk\
+ZXBlbmRlbmNpZXM6CiAgICAtICdyZWdpc3RyeS5hY2Nlc3MucmVkaGF0LmNvbS9yaHNjbC9wb3N0\
+Z3Jlc3FsLTk0LXJoZWw3JwogICAgLSAncmVnaXN0cnkuYWNjZXNzLnJlZGhhdC5jb20vcmhzY2wv\
+cG9zdGdyZXNxbC05NS1yaGVsNycKICAgIC0gJ3JlZ2lzdHJ5LmFjY2Vzcy5yZWRoYXQuY29tL3Jo\
+c2NsL3Bvc3RncmVzcWwtOTYtcmhlbDcnCiAgZGlzcGxheU5hbWU6IFBvc3RncmVTUUwgKEFQQikK\
+ICBjb25zb2xlLm9wZW5zaGlmdC5pby9pY29uQ2xhc3M6IGljb24tcG9zdGdyZXNxbAogIHByb3Zp\
+ZGVyRGlzcGxheU5hbWU6ICJSZWQgSGF0LCBJbmMuIgpwbGFuczoKICAtIG5hbWU6IGRldgogICAg\
+ZGVzY3JpcHRpb246IEEgc2luZ2xlIERCIHNlcnZlciB3aXRoIG5vIHN0b3JhZ2UKICAgIGZyZWU6\
+IHRydWUKICAgIG1ldGFkYXRhOgogICAgICBkaXNwbGF5TmFtZTogRGV2ZWxvcG1lbnQKICAgICAg\
+bG9uZ0Rlc2NyaXB0aW9uOgogICAgICAgIFRoaXMgcGxhbiBwcm92aWRlcyBhIHNpbmdsZSBub24t\
+SEEgUG9zdGdyZVNRTCBzZXJ2ZXIgd2l0aG91dAogICAgICAgIHBlcnNpc3RlbnQgc3RvcmFnZQog\
+ICAgICBjb3N0OiAkMC4wMAogICAgcGFyYW1ldGVyczoKICAgICAgLSBuYW1lOiBwb3N0Z3Jlc3Fs\
+X2RhdGFiYXNlCiAgICAgICAgZGVmYXVsdDogYWRtaW4KICAgICAgICB0eXBlOiBzdHJpbmcKICAg\
+ICAgICB0aXRsZTogUG9zdGdyZVNRTCBEYXRhYmFzZSBOYW1lCiAgICAgICAgcGF0dGVybjogIl5b\
+YS16QS1aX11bYS16QS1aMC05X10qJCIKICAgICAgICByZXF1aXJlZDogdHJ1ZQogICAgICAtIG5h\
+bWU6IHBvc3RncmVzcWxfdXNlcgogICAgICAgIGRlZmF1bHQ6IGFkbWluCiAgICAgICAgdGl0bGU6\
+IFBvc3RncmVTUUwgVXNlcgogICAgICAgIHR5cGU6IHN0cmluZwogICAgICAgIG1heGxlbmd0aDog\
+NjMKICAgICAgICBwYXR0ZXJuOiAiXlthLXpBLVpfXVthLXpBLVowLTlfXSokIgogICAgICAgIHJl\
+cXVpcmVkOiB0cnVlCiAgICAgIC0gbmFtZTogcG9zdGdyZXNxbF9wYXNzd29yZAogICAgICAgIHR5\
+cGU6IHN0cmluZwogICAgICAgIHRpdGxlOiBQb3N0Z3JlU1FMIFBhc3N3b3JkCiAgICAgICAgZGlz\
+cGxheV90eXBlOiBwYXNzd29yZAogICAgICAgIHBhdHRlcm46ICJeW2EtekEtWjAtOV9+IUAjJCVe\
+JiooKS09PD4sLj87OnxdKyQiCiAgICAgICAgcmVxdWlyZWQ6IHRydWUKICAgICAgLSBuYW1lOiBw\
+b3N0Z3Jlc3FsX3ZlcnNpb24KICAgICAgICBkZWZhdWx0OiAnOS42JwogICAgICAgIGVudW06IFsn\
+OS42JywgJzkuNScsICc5LjQnXQogICAgICAgIHR5cGU6IGVudW0KICAgICAgICB0aXRsZTogUG9z\
+dGdyZVNRTCBWZXJzaW9uCiAgICAgICAgcmVxdWlyZWQ6IHRydWUKICAgICAgICB1cGRhdGFibGU6\
+IHRydWUKICAgIHVwZGF0ZXNfdG86CiAgICAgIC0gcHJvZAogIC0gbmFtZTogcHJvZAogICAgZGVz\
+Y3JpcHRpb246IEEgc2luZ2xlIERCIHNlcnZlciB3aXRoIHBlcnNpc3RlbnQgc3RvcmFnZQogICAg\
+ZnJlZTogdHJ1ZQogICAgbWV0YWRhdGE6CiAgICAgIGRpc3BsYXlOYW1lOiBQcm9kdWN0aW9uCiAg\
+ICAgIGxvbmdEZXNjcmlwdGlvbjoKICAgICAgICBUaGlzIHBsYW4gcHJvdmlkZXMgYSBzaW5nbGUg\
+bm9uLUhBIFBvc3RncmVTUUwgc2VydmVyIHdpdGgKICAgICAgICBwZXJzaXN0ZW50IHN0b3JhZ2UK\
+ICAgICAgY29zdDogJDAuMDAKICAgIHBhcmFtZXRlcnM6CiAgICAgIC0gbmFtZTogcG9zdGdyZXNx\
+bF9kYXRhYmFzZQogICAgICAgIGRlZmF1bHQ6IGFkbWluCiAgICAgICAgdHlwZTogc3RyaW5nCiAg\
+ICAgICAgdGl0bGU6IFBvc3RncmVTUUwgRGF0YWJhc2UgTmFtZQogICAgICAgIHBhdHRlcm46ICJe\
+W2EtekEtWl9dW2EtekEtWjAtOV9dKiQiCiAgICAgICAgcmVxdWlyZWQ6IHRydWUKICAgICAgLSBu\
+YW1lOiBwb3N0Z3Jlc3FsX3VzZXIKICAgICAgICBkZWZhdWx0OiBhZG1pbgogICAgICAgIHRpdGxl\
+OiBQb3N0Z3JlU1FMIFVzZXIKICAgICAgICB0eXBlOiBzdHJpbmcKICAgICAgICBtYXhsZW5ndGg6\
+IDYzCiAgICAgICAgcGF0dGVybjogIl5bYS16QS1aX11bYS16QS1aMC05X10qJCIKICAgICAgICBy\
+ZXF1aXJlZDogdHJ1ZQogICAgICAtIG5hbWU6IHBvc3RncmVzcWxfcGFzc3dvcmQKICAgICAgICB0\
+eXBlOiBzdHJpbmcKICAgICAgICB0aXRsZTogUG9zdGdyZVNRTCBQYXNzd29yZAogICAgICAgIGRp\
+c3BsYXlfdHlwZTogcGFzc3dvcmQKICAgICAgICBwYXR0ZXJuOiAiXlthLXpBLVowLTlffiFAIyQl\
+XiYqKCktPTw+LC4/Ozp8XSskIgogICAgICAgIHJlcXVpcmVkOiB0cnVlCiAgICAgIC0gbmFtZTog\
+cG9zdGdyZXNxbF92ZXJzaW9uCiAgICAgICAgZGVmYXVsdDogJzkuNicKICAgICAgICBlbnVtOiBb\
+JzkuNicsICc5LjUnLCAnOS40J10KICAgICAgICB0eXBlOiBlbnVtCiAgICAgICAgdGl0bGU6IFBv\
+c3RncmVTUUwgVmVyc2lvbgogICAgICAgIHJlcXVpcmVkOiB0cnVlCiAgICAgICAgdXBkYXRhYmxl\
+OiB0cnVlCiAgICAgIC0gbmFtZTogcG9zdGdyZXNxbF92b2x1bWVfc2l6ZQogICAgICAgIHR5cGU6\
+IGVudW0KICAgICAgICBkZWZhdWx0OiAnMUdpJwogICAgICAgIGVudW06IFsnMUdpJywgJzVHaScs\
+ICcxMEdpJ10KICAgICAgICB0aXRsZTogUG9zdGdyZVNRTCBWb2x1bWUgU2l6ZQogICAgICAgIHJl\
+cXVpcmVkOiB0cnVlCiAgICB1cGRhdGVzX3RvOgogICAgICAtIGRldgo="
 
 
 COPY roles /opt/ansible/roles
diff --git a/Dockerfile-latest b/Dockerfile-latest
index 1813c88..db21b0e 100644
--- a/Dockerfile-latest
+++ b/Dockerfile-latest
@@ -2,43 +2,58 @@ FROM ansibleplaybookbundle/apb-base:latest
 # MAINTAINER {{ $MAINTAINER }}
 
 LABEL "com.redhat.apb.spec"=\
-"IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj\
-IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKIyBTaGFyZWQgUGFyYW1ldGVycwojIyMjIyMjIyMjIyMj\
-IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj\
-IyMjIyMjIyMjIwpfcDogJl9wCiAgLSBuYW1lOiBwb3N0Z3Jlc3FsX2RhdGFiYXNlCiAgICBkZWZh\
-dWx0OiBhZG1pbgogICAgdHlwZTogc3RyaW5nCiAgICB0aXRsZTogUG9zdGdyZVNRTCBEYXRhYmFz\
-ZSBOYW1lCiAgICByZXF1aXJlZDogdHJ1ZQogIC0gbmFtZTogcG9zdGdyZXNxbF91c2VyCiAgICBk\
-ZWZhdWx0OiBhZG1pbgogICAgdGl0bGU6IFBvc3RncmVTUUwgVXNlcgogICAgdHlwZTogc3RyaW5n\
-CiAgICBtYXhsZW5ndGg6IDYzCiAgICByZXF1aXJlZDogdHJ1ZQogIC0gbmFtZTogcG9zdGdyZXNx\
-bF9wYXNzd29yZAogICAgdHlwZTogc3RyaW5nCiAgICBkZXNjcmlwdGlvbjogQSByYW5kb20gYWxw\
-aGFudW1lcmljIHN0cmluZyBpZiBsZWZ0IGJsYW5rCiAgICB0aXRsZTogUG9zdGdyZVNRTCBQYXNz\
-d29yZAogICAgZGlzcGxheV90eXBlOiBwYXNzd29yZAogICAgcmVxdWlyZWQ6IHRydWUKICAtIG5h\
-bWU6IHBvc3RncmVzcWxfdmVyc2lvbgogICAgZGVmYXVsdDogJzkuNicKICAgIGVudW06IFsnOS42\
-JywgJzkuNScsICc5LjQnXQogICAgdHlwZTogZW51bQogICAgdGl0bGU6IFBvc3RncmVTUUwgVmVy\
-c2lvbgogICAgcmVxdWlyZWQ6IHRydWUKICAgIHVwZGF0YWJsZTogdHJ1ZQojIyMjIyMjIyMjIyMj\
-IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj\
-IyMjIyMjIyMjIwp2ZXJzaW9uOiAxLjAKbmFtZTogcG9zdGdyZXNxbC1hcGIKZGVzY3JpcHRpb246\
-IFNDTCBQb3N0Z3JlU1FMIGFwYiBpbXBsZW1lbnRhdGlvbgpiaW5kYWJsZTogdHJ1ZQphc3luYzog\
-b3B0aW9uYWwKdGFnczoKICAtIGRhdGFiYXNlCiAgLSBwb3N0Z3Jlc3FsCm1ldGFkYXRhOgogIGRv\
-Y3VtZW50YXRpb25Vcmw6IGh0dHBzOi8vd3d3LnBvc3RncmVzcWwub3JnL2RvY3MvCiAgbG9uZ0Rl\
-c2NyaXB0aW9uOiBBbiBhcGIgdGhhdCBkZXBsb3lzIHBvc3RncmVzcWwgOS40LCA5LjUsIG9yIDku\
-Ni4KICBkZXBlbmRlbmNpZXM6CiAgICAtICdyZWdpc3RyeS5hY2Nlc3MucmVkaGF0LmNvbS9yaHNj\
-bC9wb3N0Z3Jlc3FsLTk0LXJoZWw3JwogICAgLSAncmVnaXN0cnkuYWNjZXNzLnJlZGhhdC5jb20v\
-cmhzY2wvcG9zdGdyZXNxbC05NS1yaGVsNycKICAgIC0gJ3JlZ2lzdHJ5LmFjY2Vzcy5yZWRoYXQu\
-Y29tL3Joc2NsL3Bvc3RncmVzcWwtOTYtcmhlbDcnCiAgZGlzcGxheU5hbWU6IFBvc3RncmVTUUwg\
-KEFQQikKICBjb25zb2xlLm9wZW5zaGlmdC5pby9pY29uQ2xhc3M6IGljb24tcG9zdGdyZXNxbAog\
-IHByb3ZpZGVyRGlzcGxheU5hbWU6ICJSZWQgSGF0LCBJbmMuIgpwbGFuczoKICAtIG5hbWU6IGRl\
-dgogICAgZGVzY3JpcHRpb246IEEgc2luZ2xlIERCIHNlcnZlciB3aXRoIG5vIHN0b3JhZ2UKICAg\
-IGZyZWU6IHRydWUKICAgIG1ldGFkYXRhOgogICAgICBkaXNwbGF5TmFtZTogRGV2ZWxvcG1lbnQK\
-ICAgICAgbG9uZ0Rlc2NyaXB0aW9uOiBUaGlzIHBsYW4gcHJvdmlkZXMgYSBzaW5nbGUgbm9uLUhB\
-IFBvc3RncmVTUUwgc2VydmVyIHdpdGhvdXQgcGVyc2lzdGVudCBzdG9yYWdlCiAgICAgIGNvc3Q6\
-ICQwLjAwCiAgICBwYXJhbWV0ZXJzOiAqX3AKICAgIHVwZGF0ZXNfdG86CiAgICAgIC0gcHJvZAog\
-IC0gbmFtZTogcHJvZAogICAgZGVzY3JpcHRpb246IEEgc2luZ2xlIERCIHNlcnZlciB3aXRoIHBl\
-cnNpc3RlbnQgc3RvcmFnZQogICAgZnJlZTogdHJ1ZQogICAgbWV0YWRhdGE6CiAgICAgIGRpc3Bs\
-YXlOYW1lOiBQcm9kdWN0aW9uCiAgICAgIGxvbmdEZXNjcmlwdGlvbjogVGhpcyBwbGFuIHByb3Zp\
-ZGVzIGEgc2luZ2xlIG5vbi1IQSBQb3N0Z3JlU1FMIHNlcnZlciB3aXRoIHBlcnNpc3RlbnQgc3Rv\
-cmFnZQogICAgICBjb3N0OiAkMC4wMAogICAgcGFyYW1ldGVyczogKl9wCiAgICB1cGRhdGVzX3Rv\
-OgogICAgICAtIGRldgo="
+"LS0tCgp2ZXJzaW9uOiAxLjAKbmFtZTogcG9zdGdyZXNxbC1hcGIKZGVzY3JpcHRpb246IFNDTCBQ\
+b3N0Z3JlU1FMIGFwYiBpbXBsZW1lbnRhdGlvbgpiaW5kYWJsZTogdHJ1ZQphc3luYzogb3B0aW9u\
+YWwKdGFnczoKICAtIGRhdGFiYXNlCiAgLSBwb3N0Z3Jlc3FsCm1ldGFkYXRhOgogIGRvY3VtZW50\
+YXRpb25Vcmw6IGh0dHBzOi8vd3d3LnBvc3RncmVzcWwub3JnL2RvY3MvCiAgbG9uZ0Rlc2NyaXB0\
+aW9uOiBBbiBhcGIgdGhhdCBkZXBsb3lzIHBvc3RncmVzcWwgOS40LCA5LjUsIG9yIDkuNi4KICBk\
+ZXBlbmRlbmNpZXM6CiAgICAtICdyZWdpc3RyeS5hY2Nlc3MucmVkaGF0LmNvbS9yaHNjbC9wb3N0\
+Z3Jlc3FsLTk0LXJoZWw3JwogICAgLSAncmVnaXN0cnkuYWNjZXNzLnJlZGhhdC5jb20vcmhzY2wv\
+cG9zdGdyZXNxbC05NS1yaGVsNycKICAgIC0gJ3JlZ2lzdHJ5LmFjY2Vzcy5yZWRoYXQuY29tL3Jo\
+c2NsL3Bvc3RncmVzcWwtOTYtcmhlbDcnCiAgZGlzcGxheU5hbWU6IFBvc3RncmVTUUwgKEFQQikK\
+ICBjb25zb2xlLm9wZW5zaGlmdC5pby9pY29uQ2xhc3M6IGljb24tcG9zdGdyZXNxbAogIHByb3Zp\
+ZGVyRGlzcGxheU5hbWU6ICJSZWQgSGF0LCBJbmMuIgpwbGFuczoKICAtIG5hbWU6IGRldgogICAg\
+ZGVzY3JpcHRpb246IEEgc2luZ2xlIERCIHNlcnZlciB3aXRoIG5vIHN0b3JhZ2UKICAgIGZyZWU6\
+IHRydWUKICAgIG1ldGFkYXRhOgogICAgICBkaXNwbGF5TmFtZTogRGV2ZWxvcG1lbnQKICAgICAg\
+bG9uZ0Rlc2NyaXB0aW9uOgogICAgICAgIFRoaXMgcGxhbiBwcm92aWRlcyBhIHNpbmdsZSBub24t\
+SEEgUG9zdGdyZVNRTCBzZXJ2ZXIgd2l0aG91dAogICAgICAgIHBlcnNpc3RlbnQgc3RvcmFnZQog\
+ICAgICBjb3N0OiAkMC4wMAogICAgcGFyYW1ldGVyczoKICAgICAgLSBuYW1lOiBwb3N0Z3Jlc3Fs\
+X2RhdGFiYXNlCiAgICAgICAgZGVmYXVsdDogYWRtaW4KICAgICAgICB0eXBlOiBzdHJpbmcKICAg\
+ICAgICB0aXRsZTogUG9zdGdyZVNRTCBEYXRhYmFzZSBOYW1lCiAgICAgICAgcGF0dGVybjogIl5b\
+YS16QS1aX11bYS16QS1aMC05X10qJCIKICAgICAgICByZXF1aXJlZDogdHJ1ZQogICAgICAtIG5h\
+bWU6IHBvc3RncmVzcWxfdXNlcgogICAgICAgIGRlZmF1bHQ6IGFkbWluCiAgICAgICAgdGl0bGU6\
+IFBvc3RncmVTUUwgVXNlcgogICAgICAgIHR5cGU6IHN0cmluZwogICAgICAgIG1heGxlbmd0aDog\
+NjMKICAgICAgICBwYXR0ZXJuOiAiXlthLXpBLVpfXVthLXpBLVowLTlfXSokIgogICAgICAgIHJl\
+cXVpcmVkOiB0cnVlCiAgICAgIC0gbmFtZTogcG9zdGdyZXNxbF9wYXNzd29yZAogICAgICAgIHR5\
+cGU6IHN0cmluZwogICAgICAgIHRpdGxlOiBQb3N0Z3JlU1FMIFBhc3N3b3JkCiAgICAgICAgZGlz\
+cGxheV90eXBlOiBwYXNzd29yZAogICAgICAgIHBhdHRlcm46ICJeW2EtekEtWjAtOV9+IUAjJCVe\
+JiooKS09PD4sLj87OnxdKyQiCiAgICAgICAgcmVxdWlyZWQ6IHRydWUKICAgICAgLSBuYW1lOiBw\
+b3N0Z3Jlc3FsX3ZlcnNpb24KICAgICAgICBkZWZhdWx0OiAnOS42JwogICAgICAgIGVudW06IFsn\
+OS42JywgJzkuNScsICc5LjQnXQogICAgICAgIHR5cGU6IGVudW0KICAgICAgICB0aXRsZTogUG9z\
+dGdyZVNRTCBWZXJzaW9uCiAgICAgICAgcmVxdWlyZWQ6IHRydWUKICAgICAgICB1cGRhdGFibGU6\
+IHRydWUKICAgIHVwZGF0ZXNfdG86CiAgICAgIC0gcHJvZAogIC0gbmFtZTogcHJvZAogICAgZGVz\
+Y3JpcHRpb246IEEgc2luZ2xlIERCIHNlcnZlciB3aXRoIHBlcnNpc3RlbnQgc3RvcmFnZQogICAg\
+ZnJlZTogdHJ1ZQogICAgbWV0YWRhdGE6CiAgICAgIGRpc3BsYXlOYW1lOiBQcm9kdWN0aW9uCiAg\
+ICAgIGxvbmdEZXNjcmlwdGlvbjoKICAgICAgICBUaGlzIHBsYW4gcHJvdmlkZXMgYSBzaW5nbGUg\
+bm9uLUhBIFBvc3RncmVTUUwgc2VydmVyIHdpdGgKICAgICAgICBwZXJzaXN0ZW50IHN0b3JhZ2UK\
+ICAgICAgY29zdDogJDAuMDAKICAgIHBhcmFtZXRlcnM6CiAgICAgIC0gbmFtZTogcG9zdGdyZXNx\
+bF9kYXRhYmFzZQogICAgICAgIGRlZmF1bHQ6IGFkbWluCiAgICAgICAgdHlwZTogc3RyaW5nCiAg\
+ICAgICAgdGl0bGU6IFBvc3RncmVTUUwgRGF0YWJhc2UgTmFtZQogICAgICAgIHBhdHRlcm46ICJe\
+W2EtekEtWl9dW2EtekEtWjAtOV9dKiQiCiAgICAgICAgcmVxdWlyZWQ6IHRydWUKICAgICAgLSBu\
+YW1lOiBwb3N0Z3Jlc3FsX3VzZXIKICAgICAgICBkZWZhdWx0OiBhZG1pbgogICAgICAgIHRpdGxl\
+OiBQb3N0Z3JlU1FMIFVzZXIKICAgICAgICB0eXBlOiBzdHJpbmcKICAgICAgICBtYXhsZW5ndGg6\
+IDYzCiAgICAgICAgcGF0dGVybjogIl5bYS16QS1aX11bYS16QS1aMC05X10qJCIKICAgICAgICBy\
+ZXF1aXJlZDogdHJ1ZQogICAgICAtIG5hbWU6IHBvc3RncmVzcWxfcGFzc3dvcmQKICAgICAgICB0\
+eXBlOiBzdHJpbmcKICAgICAgICB0aXRsZTogUG9zdGdyZVNRTCBQYXNzd29yZAogICAgICAgIGRp\
+c3BsYXlfdHlwZTogcGFzc3dvcmQKICAgICAgICBwYXR0ZXJuOiAiXlthLXpBLVowLTlffiFAIyQl\
+XiYqKCktPTw+LC4/Ozp8XSskIgogICAgICAgIHJlcXVpcmVkOiB0cnVlCiAgICAgIC0gbmFtZTog\
+cG9zdGdyZXNxbF92ZXJzaW9uCiAgICAgICAgZGVmYXVsdDogJzkuNicKICAgICAgICBlbnVtOiBb\
+JzkuNicsICc5LjUnLCAnOS40J10KICAgICAgICB0eXBlOiBlbnVtCiAgICAgICAgdGl0bGU6IFBv\
+c3RncmVTUUwgVmVyc2lvbgogICAgICAgIHJlcXVpcmVkOiB0cnVlCiAgICAgICAgdXBkYXRhYmxl\
+OiB0cnVlCiAgICAgIC0gbmFtZTogcG9zdGdyZXNxbF92b2x1bWVfc2l6ZQogICAgICAgIHR5cGU6\
+IGVudW0KICAgICAgICBkZWZhdWx0OiAnMUdpJwogICAgICAgIGVudW06IFsnMUdpJywgJzVHaScs\
+ICcxMEdpJ10KICAgICAgICB0aXRsZTogUG9zdGdyZVNRTCBWb2x1bWUgU2l6ZQogICAgICAgIHJl\
+cXVpcmVkOiB0cnVlCiAgICB1cGRhdGVzX3RvOgogICAgICAtIGRldgo="
 
 
 RUN yum -y install postgresql-apb-role && yum clean all
diff --git a/Dockerfile-nightly b/Dockerfile-nightly
index b29993c..22eb2a2 100644
--- a/Dockerfile-nightly
+++ b/Dockerfile-nightly
@@ -2,43 +2,58 @@ FROM ansibleplaybookbundle/apb-base:nightly
 # MAINTAINER {{ $MAINTAINER }}
 
 LABEL "com.redhat.apb.spec"=\
-"IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj\
-IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKIyBTaGFyZWQgUGFyYW1ldGVycwojIyMjIyMjIyMjIyMj\
-IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj\
-IyMjIyMjIyMjIwpfcDogJl9wCiAgLSBuYW1lOiBwb3N0Z3Jlc3FsX2RhdGFiYXNlCiAgICBkZWZh\
-dWx0OiBhZG1pbgogICAgdHlwZTogc3RyaW5nCiAgICB0aXRsZTogUG9zdGdyZVNRTCBEYXRhYmFz\
-ZSBOYW1lCiAgICByZXF1aXJlZDogdHJ1ZQogIC0gbmFtZTogcG9zdGdyZXNxbF91c2VyCiAgICBk\
-ZWZhdWx0OiBhZG1pbgogICAgdGl0bGU6IFBvc3RncmVTUUwgVXNlcgogICAgdHlwZTogc3RyaW5n\
-CiAgICBtYXhsZW5ndGg6IDYzCiAgICByZXF1aXJlZDogdHJ1ZQogIC0gbmFtZTogcG9zdGdyZXNx\
-bF9wYXNzd29yZAogICAgdHlwZTogc3RyaW5nCiAgICBkZXNjcmlwdGlvbjogQSByYW5kb20gYWxw\
-aGFudW1lcmljIHN0cmluZyBpZiBsZWZ0IGJsYW5rCiAgICB0aXRsZTogUG9zdGdyZVNRTCBQYXNz\
-d29yZAogICAgZGlzcGxheV90eXBlOiBwYXNzd29yZAogICAgcmVxdWlyZWQ6IHRydWUKICAtIG5h\
-bWU6IHBvc3RncmVzcWxfdmVyc2lvbgogICAgZGVmYXVsdDogJzkuNicKICAgIGVudW06IFsnOS42\
-JywgJzkuNScsICc5LjQnXQogICAgdHlwZTogZW51bQogICAgdGl0bGU6IFBvc3RncmVTUUwgVmVy\
-c2lvbgogICAgcmVxdWlyZWQ6IHRydWUKICAgIHVwZGF0YWJsZTogdHJ1ZQojIyMjIyMjIyMjIyMj\
-IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj\
-IyMjIyMjIyMjIwp2ZXJzaW9uOiAxLjAKbmFtZTogcG9zdGdyZXNxbC1hcGIKZGVzY3JpcHRpb246\
-IFNDTCBQb3N0Z3JlU1FMIGFwYiBpbXBsZW1lbnRhdGlvbgpiaW5kYWJsZTogdHJ1ZQphc3luYzog\
-b3B0aW9uYWwKdGFnczoKICAtIGRhdGFiYXNlCiAgLSBwb3N0Z3Jlc3FsCm1ldGFkYXRhOgogIGRv\
-Y3VtZW50YXRpb25Vcmw6IGh0dHBzOi8vd3d3LnBvc3RncmVzcWwub3JnL2RvY3MvCiAgbG9uZ0Rl\
-c2NyaXB0aW9uOiBBbiBhcGIgdGhhdCBkZXBsb3lzIHBvc3RncmVzcWwgOS40LCA5LjUsIG9yIDku\
-Ni4KICBkZXBlbmRlbmNpZXM6CiAgICAtICdyZWdpc3RyeS5hY2Nlc3MucmVkaGF0LmNvbS9yaHNj\
-bC9wb3N0Z3Jlc3FsLTk0LXJoZWw3JwogICAgLSAncmVnaXN0cnkuYWNjZXNzLnJlZGhhdC5jb20v\
-cmhzY2wvcG9zdGdyZXNxbC05NS1yaGVsNycKICAgIC0gJ3JlZ2lzdHJ5LmFjY2Vzcy5yZWRoYXQu\
-Y29tL3Joc2NsL3Bvc3RncmVzcWwtOTYtcmhlbDcnCiAgZGlzcGxheU5hbWU6IFBvc3RncmVTUUwg\
-KEFQQikKICBjb25zb2xlLm9wZW5zaGlmdC5pby9pY29uQ2xhc3M6IGljb24tcG9zdGdyZXNxbAog\
-IHByb3ZpZGVyRGlzcGxheU5hbWU6ICJSZWQgSGF0LCBJbmMuIgpwbGFuczoKICAtIG5hbWU6IGRl\
-dgogICAgZGVzY3JpcHRpb246IEEgc2luZ2xlIERCIHNlcnZlciB3aXRoIG5vIHN0b3JhZ2UKICAg\
-IGZyZWU6IHRydWUKICAgIG1ldGFkYXRhOgogICAgICBkaXNwbGF5TmFtZTogRGV2ZWxvcG1lbnQK\
-ICAgICAgbG9uZ0Rlc2NyaXB0aW9uOiBUaGlzIHBsYW4gcHJvdmlkZXMgYSBzaW5nbGUgbm9uLUhB\
-IFBvc3RncmVTUUwgc2VydmVyIHdpdGhvdXQgcGVyc2lzdGVudCBzdG9yYWdlCiAgICAgIGNvc3Q6\
-ICQwLjAwCiAgICBwYXJhbWV0ZXJzOiAqX3AKICAgIHVwZGF0ZXNfdG86CiAgICAgIC0gcHJvZAog\
-IC0gbmFtZTogcHJvZAogICAgZGVzY3JpcHRpb246IEEgc2luZ2xlIERCIHNlcnZlciB3aXRoIHBl\
-cnNpc3RlbnQgc3RvcmFnZQogICAgZnJlZTogdHJ1ZQogICAgbWV0YWRhdGE6CiAgICAgIGRpc3Bs\
-YXlOYW1lOiBQcm9kdWN0aW9uCiAgICAgIGxvbmdEZXNjcmlwdGlvbjogVGhpcyBwbGFuIHByb3Zp\
-ZGVzIGEgc2luZ2xlIG5vbi1IQSBQb3N0Z3JlU1FMIHNlcnZlciB3aXRoIHBlcnNpc3RlbnQgc3Rv\
-cmFnZQogICAgICBjb3N0OiAkMC4wMAogICAgcGFyYW1ldGVyczogKl9wCiAgICB1cGRhdGVzX3Rv\
-OgogICAgICAtIGRldgo="
+"LS0tCgp2ZXJzaW9uOiAxLjAKbmFtZTogcG9zdGdyZXNxbC1hcGIKZGVzY3JpcHRpb246IFNDTCBQ\
+b3N0Z3JlU1FMIGFwYiBpbXBsZW1lbnRhdGlvbgpiaW5kYWJsZTogdHJ1ZQphc3luYzogb3B0aW9u\
+YWwKdGFnczoKICAtIGRhdGFiYXNlCiAgLSBwb3N0Z3Jlc3FsCm1ldGFkYXRhOgogIGRvY3VtZW50\
+YXRpb25Vcmw6IGh0dHBzOi8vd3d3LnBvc3RncmVzcWwub3JnL2RvY3MvCiAgbG9uZ0Rlc2NyaXB0\
+aW9uOiBBbiBhcGIgdGhhdCBkZXBsb3lzIHBvc3RncmVzcWwgOS40LCA5LjUsIG9yIDkuNi4KICBk\
+ZXBlbmRlbmNpZXM6CiAgICAtICdyZWdpc3RyeS5hY2Nlc3MucmVkaGF0LmNvbS9yaHNjbC9wb3N0\
+Z3Jlc3FsLTk0LXJoZWw3JwogICAgLSAncmVnaXN0cnkuYWNjZXNzLnJlZGhhdC5jb20vcmhzY2wv\
+cG9zdGdyZXNxbC05NS1yaGVsNycKICAgIC0gJ3JlZ2lzdHJ5LmFjY2Vzcy5yZWRoYXQuY29tL3Jo\
+c2NsL3Bvc3RncmVzcWwtOTYtcmhlbDcnCiAgZGlzcGxheU5hbWU6IFBvc3RncmVTUUwgKEFQQikK\
+ICBjb25zb2xlLm9wZW5zaGlmdC5pby9pY29uQ2xhc3M6IGljb24tcG9zdGdyZXNxbAogIHByb3Zp\
+ZGVyRGlzcGxheU5hbWU6ICJSZWQgSGF0LCBJbmMuIgpwbGFuczoKICAtIG5hbWU6IGRldgogICAg\
+ZGVzY3JpcHRpb246IEEgc2luZ2xlIERCIHNlcnZlciB3aXRoIG5vIHN0b3JhZ2UKICAgIGZyZWU6\
+IHRydWUKICAgIG1ldGFkYXRhOgogICAgICBkaXNwbGF5TmFtZTogRGV2ZWxvcG1lbnQKICAgICAg\
+bG9uZ0Rlc2NyaXB0aW9uOgogICAgICAgIFRoaXMgcGxhbiBwcm92aWRlcyBhIHNpbmdsZSBub24t\
+SEEgUG9zdGdyZVNRTCBzZXJ2ZXIgd2l0aG91dAogICAgICAgIHBlcnNpc3RlbnQgc3RvcmFnZQog\
+ICAgICBjb3N0OiAkMC4wMAogICAgcGFyYW1ldGVyczoKICAgICAgLSBuYW1lOiBwb3N0Z3Jlc3Fs\
+X2RhdGFiYXNlCiAgICAgICAgZGVmYXVsdDogYWRtaW4KICAgICAgICB0eXBlOiBzdHJpbmcKICAg\
+ICAgICB0aXRsZTogUG9zdGdyZVNRTCBEYXRhYmFzZSBOYW1lCiAgICAgICAgcGF0dGVybjogIl5b\
+YS16QS1aX11bYS16QS1aMC05X10qJCIKICAgICAgICByZXF1aXJlZDogdHJ1ZQogICAgICAtIG5h\
+bWU6IHBvc3RncmVzcWxfdXNlcgogICAgICAgIGRlZmF1bHQ6IGFkbWluCiAgICAgICAgdGl0bGU6\
+IFBvc3RncmVTUUwgVXNlcgogICAgICAgIHR5cGU6IHN0cmluZwogICAgICAgIG1heGxlbmd0aDog\
+NjMKICAgICAgICBwYXR0ZXJuOiAiXlthLXpBLVpfXVthLXpBLVowLTlfXSokIgogICAgICAgIHJl\
+cXVpcmVkOiB0cnVlCiAgICAgIC0gbmFtZTogcG9zdGdyZXNxbF9wYXNzd29yZAogICAgICAgIHR5\
+cGU6IHN0cmluZwogICAgICAgIHRpdGxlOiBQb3N0Z3JlU1FMIFBhc3N3b3JkCiAgICAgICAgZGlz\
+cGxheV90eXBlOiBwYXNzd29yZAogICAgICAgIHBhdHRlcm46ICJeW2EtekEtWjAtOV9+IUAjJCVe\
+JiooKS09PD4sLj87OnxdKyQiCiAgICAgICAgcmVxdWlyZWQ6IHRydWUKICAgICAgLSBuYW1lOiBw\
+b3N0Z3Jlc3FsX3ZlcnNpb24KICAgICAgICBkZWZhdWx0OiAnOS42JwogICAgICAgIGVudW06IFsn\
+OS42JywgJzkuNScsICc5LjQnXQogICAgICAgIHR5cGU6IGVudW0KICAgICAgICB0aXRsZTogUG9z\
+dGdyZVNRTCBWZXJzaW9uCiAgICAgICAgcmVxdWlyZWQ6IHRydWUKICAgICAgICB1cGRhdGFibGU6\
+IHRydWUKICAgIHVwZGF0ZXNfdG86CiAgICAgIC0gcHJvZAogIC0gbmFtZTogcHJvZAogICAgZGVz\
+Y3JpcHRpb246IEEgc2luZ2xlIERCIHNlcnZlciB3aXRoIHBlcnNpc3RlbnQgc3RvcmFnZQogICAg\
+ZnJlZTogdHJ1ZQogICAgbWV0YWRhdGE6CiAgICAgIGRpc3BsYXlOYW1lOiBQcm9kdWN0aW9uCiAg\
+ICAgIGxvbmdEZXNjcmlwdGlvbjoKICAgICAgICBUaGlzIHBsYW4gcHJvdmlkZXMgYSBzaW5nbGUg\
+bm9uLUhBIFBvc3RncmVTUUwgc2VydmVyIHdpdGgKICAgICAgICBwZXJzaXN0ZW50IHN0b3JhZ2UK\
+ICAgICAgY29zdDogJDAuMDAKICAgIHBhcmFtZXRlcnM6CiAgICAgIC0gbmFtZTogcG9zdGdyZXNx\
+bF9kYXRhYmFzZQogICAgICAgIGRlZmF1bHQ6IGFkbWluCiAgICAgICAgdHlwZTogc3RyaW5nCiAg\
+ICAgICAgdGl0bGU6IFBvc3RncmVTUUwgRGF0YWJhc2UgTmFtZQogICAgICAgIHBhdHRlcm46ICJe\
+W2EtekEtWl9dW2EtekEtWjAtOV9dKiQiCiAgICAgICAgcmVxdWlyZWQ6IHRydWUKICAgICAgLSBu\
+YW1lOiBwb3N0Z3Jlc3FsX3VzZXIKICAgICAgICBkZWZhdWx0OiBhZG1pbgogICAgICAgIHRpdGxl\
+OiBQb3N0Z3JlU1FMIFVzZXIKICAgICAgICB0eXBlOiBzdHJpbmcKICAgICAgICBtYXhsZW5ndGg6\
+IDYzCiAgICAgICAgcGF0dGVybjogIl5bYS16QS1aX11bYS16QS1aMC05X10qJCIKICAgICAgICBy\
+ZXF1aXJlZDogdHJ1ZQogICAgICAtIG5hbWU6IHBvc3RncmVzcWxfcGFzc3dvcmQKICAgICAgICB0\
+eXBlOiBzdHJpbmcKICAgICAgICB0aXRsZTogUG9zdGdyZVNRTCBQYXNzd29yZAogICAgICAgIGRp\
+c3BsYXlfdHlwZTogcGFzc3dvcmQKICAgICAgICBwYXR0ZXJuOiAiXlthLXpBLVowLTlffiFAIyQl\
+XiYqKCktPTw+LC4/Ozp8XSskIgogICAgICAgIHJlcXVpcmVkOiB0cnVlCiAgICAgIC0gbmFtZTog\
+cG9zdGdyZXNxbF92ZXJzaW9uCiAgICAgICAgZGVmYXVsdDogJzkuNicKICAgICAgICBlbnVtOiBb\
+JzkuNicsICc5LjUnLCAnOS40J10KICAgICAgICB0eXBlOiBlbnVtCiAgICAgICAgdGl0bGU6IFBv\
+c3RncmVTUUwgVmVyc2lvbgogICAgICAgIHJlcXVpcmVkOiB0cnVlCiAgICAgICAgdXBkYXRhYmxl\
+OiB0cnVlCiAgICAgIC0gbmFtZTogcG9zdGdyZXNxbF92b2x1bWVfc2l6ZQogICAgICAgIHR5cGU6\
+IGVudW0KICAgICAgICBkZWZhdWx0OiAnMUdpJwogICAgICAgIGVudW06IFsnMUdpJywgJzVHaScs\
+ICcxMEdpJ10KICAgICAgICB0aXRsZTogUG9zdGdyZVNRTCBWb2x1bWUgU2l6ZQogICAgICAgIHJl\
+cXVpcmVkOiB0cnVlCiAgICB1cGRhdGVzX3RvOgogICAgICAtIGRldgo="
 
 
 RUN yum -y install postgresql-apb-role && yum clean all
diff --git a/apb.yml b/apb.yml
index ff5812f..b0fb8db 100644
--- a/apb.yml
+++ b/apb.yml
@@ -1,34 +1,5 @@
-################################################################################
-# Shared Parameters
-################################################################################
-_p: &_p
-  - name: postgresql_database
-    default: admin
-    type: string
-    title: PostgreSQL Database Name
-    pattern: "^[a-zA-Z_][a-zA-Z0-9_]*$"
-    required: true
-  - name: postgresql_user
-    default: admin
-    title: PostgreSQL User
-    type: string
-    maxlength: 63
-    pattern: "^[a-zA-Z_][a-zA-Z0-9_]*$"
-    required: true
-  - name: postgresql_password
-    type: string
-    title: PostgreSQL Password
-    display_type: password
-    pattern: "^[a-zA-Z0-9_~!@#$%^&*()-=<>,.?;:|]+$"
-    required: true
-  - name: postgresql_version
-    default: '9.6'
-    enum: ['9.6', '9.5', '9.4']
-    type: enum
-    title: PostgreSQL Version
-    required: true
-    updatable: true
-################################################################################
+---
+
 version: 1.0
 name: postgresql-apb
 description: SCL PostgreSQL apb implementation
@@ -53,9 +24,37 @@ plans:
     free: true
     metadata:
       displayName: Development
-      longDescription: This plan provides a single non-HA PostgreSQL server without persistent storage
+      longDescription:
+        This plan provides a single non-HA PostgreSQL server without
+        persistent storage
       cost: $0.00
-    parameters: *_p
+    parameters:
+      - name: postgresql_database
+        default: admin
+        type: string
+        title: PostgreSQL Database Name
+        pattern: "^[a-zA-Z_][a-zA-Z0-9_]*$"
+        required: true
+      - name: postgresql_user
+        default: admin
+        title: PostgreSQL User
+        type: string
+        maxlength: 63
+        pattern: "^[a-zA-Z_][a-zA-Z0-9_]*$"
+        required: true
+      - name: postgresql_password
+        type: string
+        title: PostgreSQL Password
+        display_type: password
+        pattern: "^[a-zA-Z0-9_~!@#$%^&*()-=<>,.?;:|]+$"
+        required: true
+      - name: postgresql_version
+        default: '9.6'
+        enum: ['9.6', '9.5', '9.4']
+        type: enum
+        title: PostgreSQL Version
+        required: true
+        updatable: true
     updates_to:
       - prod
   - name: prod
@@ -63,8 +62,42 @@ plans:
     free: true
     metadata:
       displayName: Production
-      longDescription: This plan provides a single non-HA PostgreSQL server with persistent storage
+      longDescription:
+        This plan provides a single non-HA PostgreSQL server with
+        persistent storage
       cost: $0.00
-    parameters: *_p
+    parameters:
+      - name: postgresql_database
+        default: admin
+        type: string
+        title: PostgreSQL Database Name
+        pattern: "^[a-zA-Z_][a-zA-Z0-9_]*$"
+        required: true
+      - name: postgresql_user
+        default: admin
+        title: PostgreSQL User
+        type: string
+        maxlength: 63
+        pattern: "^[a-zA-Z_][a-zA-Z0-9_]*$"
+        required: true
+      - name: postgresql_password
+        type: string
+        title: PostgreSQL Password
+        display_type: password
+        pattern: "^[a-zA-Z0-9_~!@#$%^&*()-=<>,.?;:|]+$"
+        required: true
+      - name: postgresql_version
+        default: '9.6'
+        enum: ['9.6', '9.5', '9.4']
+        type: enum
+        title: PostgreSQL Version
+        required: true
+        updatable: true
+      - name: postgresql_volume_size
+        type: enum
+        default: '1Gi'
+        enum: ['1Gi', '5Gi', '10Gi']
+        title: PostgreSQL Volume Size
+        required: true
     updates_to:
       - dev