diff --git a/aptly/files/aptly.conf b/aptly/files/aptly.conf
index 618ec32..e7b1fcb 100644
--- a/aptly/files/aptly.conf
+++ b/aptly/files/aptly.conf
@@ -9,7 +9,7 @@
   "dependencyFollowSource": {{ server.dependency.follow.source|lower }},
   {%- if server.endpoint is defined %}
   "S3PublishEndpoints": {
-    {%- for name, endpoint in server.endpoint.iteritems %}
+    {%- for name, endpoint in server.endpoint.iteritems() %}
     {%- if endpoint.engine == 's3' %}
     "{{ name }}": {
       {%- for key, value in endpoint.iteritems() %}
@@ -20,7 +20,7 @@
     {%- endfor %}
   },
   "SwiftPublishEndpoints": {
-    {%- for name, endpoint in server.endpoint.iteritems %}
+    {%- for name, endpoint in server.endpoint.iteritems() %}
     {%- if endpoint.engine == 'swift' %}
     "{{ name }}": {
       {%- for key, value in endpoint.iteritems() %}
@@ -29,14 +29,14 @@
     }
     {%- endif %}
     {%- endfor %}
-  }
+  },
   {%- endif %}
   {%- if server.secure %}
-  "gpgDisableSign": false,
-  "gpgDisableVerify": false,
+  "gpgDisableSign": {{ server.gpg.disable_sign|default(False)|lower }},
+  "gpgDisableVerify": {{ server.gpg.disable_verify|default(False)|lower }},
   {%- else %}
-  "gpgDisableSign": true,
-  "gpgDisableVerify": true,
+  "gpgDisableSign": {{ server.gpg.disable_sign|default(True)|lower }},
+  "gpgDisableVerify": {{ server.gpg.disable_verify|default(True)|lower }},
   {%- endif %}
   "downloadSourcePackages": false,
   "ppaDistributorID": "ubuntu",