diff --git a/src/config.yaml b/src/config.yaml
index 094b702..4adc1fc 100644
--- a/src/config.yaml
+++ b/src/config.yaml
@@ -1,87 +1,87 @@
-options:
-  volume-backend-name:
-    type: string
-    default: "cinder_netapp"
-    description: Service name to present to Cinder
-  netapp-storage-family:
-    type: string
-    default: "ontap_cluster"
-    description: |
+"options":
+  "volume-backend-name":
+    "type": "string"
+    "default": "cinder_netapp"
+    "description": "Service name to present to Cinder"
+  "netapp-storage-family":
+    "type": "string"
+    "default": "ontap_cluster"
+    "description": |
       The storage family type used on the storage system;
       valid values are ontap_cluster for using clustered Data ONTAP,
       or eseries for using E-Series.
-  netapp-storage-protocol:
-    type: string
-    default: "iscsi"
-    description: SAN protocol to use. Choose between iscsi or NFS.
-  netapp-vserver:
-    type: string
-    default: !!null ""
-    description: |
+  "netapp-storage-protocol":
+    "type": "string"
+    "default": "iscsi"
+    "description": "SAN protocol to use. Choose between iscsi or NFS."
+  "netapp-vserver":
+    "type": "string"
+    "default": !!null ""
+    "description": |
       This option specifies the virtual storage server
       (Vserver) name on the storage cluster on which provisioning of
       block storage volumes should occur.
-  netapp-server-hostname:
-    type: string
-    default: !!null ""
-    description: |
+  "netapp-server-hostname":
+    "type": "string"
+    "default": !!null ""
+    "description": |
       The hostname (or IP address) for the storage system or
       proxy server.
-  netapp-server-port:
-    type: int
-    default: !!null ""
-    description: |
+  "netapp-server-port":
+    "type": "int"
+    "default": !!null ""
+    "description": |
       The TCP port to use for communication with the storage
       system or proxy server. If not specified, Data ONTAP drivers will
       use 80 for HTTP and 443 for HTTPS; E-Series will use 8080 for HTTP
       and 8443 for HTTPS.
-  netapp-login:
-    type: string
-    default: !!null ""
-    description: |
+  "netapp-login":
+    "type": "string"
+    "default": !!null ""
+    "description": |
       Administrative user account name used to access the
       storage system or proxy server.
-  netapp-password:
-    type: string
-    default: !!null ""
-    description: |
+  "netapp-password":
+    "type": "string"
+    "default": !!null ""
+    "description": |
       Password for the administrative user account specified
       in the netapp_login option.
-  netapp-nfs-shares-config:
-    type: string
-    default: !!null ""
-    description: |
-        The file referenced by this configuration option should contain a
-        list of NFS shares, each on their own line, to which the driver
-        should attempt to provision new Cinder volumes into.
-  netapp-controller-ips:
-    type: string
-    default: !!null ""
-    description: |
+  "netapp-nfs-shares-config":
+    "type": "string"
+    "default": !!null ""
+    "description": |
+      The file referenced by this configuration option should contain a
+      list of NFS shares, each on their own line, to which the driver
+      should attempt to provision new Cinder volumes into.
+  "netapp-controller-ips":
+    "type": "string"
+    "default": !!null ""
+    "description": |
       This option is only utilized when the storage family is
       configured to eseries. This option is used to restrict provisioning
       to the specified controllers. Specify the value of this option to be
       a comma separated list of controller hostnames or IP addresses to be
       used for provisioning.
-  netapp-array-password:
-    type: string
-    default: !!null ""
-    description: |
+  "netapp-array-password":
+    "type": "string"
+    "default": !!null ""
+    "description": |
       Password for the NetApp E-Series storage array.
-  netapp-storage-pools:
-    type: string
-    default: !!null ""
-    description: "comma seperated list of pool names ie: pool1,pool2"
-  use-multipath:
-    type: boolean
-    default: True
-    description: |
+  "netapp-storage-pools":
+    "type": "string"
+    "default": !!null ""
+    "description": "comma seperated list of pool names ie: pool1,pool2"
+  "use-multipath":
+    "type": "boolean"
+    "default": !!bool "true"
+    "description": |
       Use multipath for image transfer. The volume_use_multipath
       option should be set to True in the nova.conf
-  netapp-enable-multiattach:
-    type: boolean
-    default: False
-    description: |
+  "netapp-enable-multiattach":
+    "type": "boolean"
+    "default": !!bool "false"
+    "description": |
       This option specifies whether the driver should allow
       operations that require multiple attachments to a volume.
       An example would be live migration of servers that have volumes
diff --git a/src/layer.yaml b/src/layer.yaml
index 06a3229..9eb6acf 100644
--- a/src/layer.yaml
+++ b/src/layer.yaml
@@ -1,17 +1,24 @@
-includes:
+"includes":
+- "layer:options"
+- "layer:basic"
+- "interface:tls-certificates"
 - "layer:openstack"
 - "interface:cinder-backend"
-- "interface:tls-certificates"
-config:
-  deletes:
-  - debug
-  - verbose
-  - use-syslog
-  - use-internal-endpoints
-  - ssl_ca
-  - ssl_cert
-  - ssl_key
-options:
-  basic:
-    use_venv: True
-repo: https://github.com/openstack-charmers/cinder-storage-backend-template
+"exclude": [".travis.yml", "tests", "tox.ini", "test-requirements.txt", "unit_tests",
+  ".gitignore", ".gitreview", ".zuul.yaml", "README.md", "requirements.txt"]
+"options":
+  "basic":
+    "use_venv": !!bool "true"
+    "packages": []
+    "python_packages": []
+    "include_system_packages": !!bool "false"
+  "openstack": {}
+  "cinder-netapp": {}
+"repo": "https://github.com/openstack-charmers/cinder-storage-backend-template"
+"config":
+  "deletes":
+  - "debug"
+  - "verbose"
+  - "use-syslog"
+  - "use-internal-endpoints"
+"is": "cinder-netapp"