diff --git a/aptly/files/aptly-publisher.yaml b/aptly/files/aptly-publisher.yaml
index 35e4a32..8f7c4ee 100644
--- a/aptly/files/aptly-publisher.yaml
+++ b/aptly/files/aptly-publisher.yaml
@@ -28,9 +28,9 @@
       {%- for distribution in mirror.publisher.distributions %}
       - {{ distribution }}
       {%- endfor %}
-    {%- if repo.publisher.architectures is defined %}
+    {%- if mirror.publisher.architectures is defined %}
     architectures:
-      {%- for arch in repo.publisher.architectures %}
+      {%- for arch in mirror.publisher.architectures %}
       - {{ arch }}
       {%- endfor %}
     {%- endif %}
diff --git a/aptly/server/init.sls b/aptly/server/init.sls
index a8bdc27..647af24 100644
--- a/aptly/server/init.sls
+++ b/aptly/server/init.sls
@@ -178,14 +178,5 @@
 
 {%- endif %}
 
-{#
-  FIXME: Hack to be able to use aptly commands when API server is running
-  https://github.com/smira/aptly/issues/234
-
-aptly_clean_lock:
-  file.absent:
-    - name: /srv/aptly/db/LOCK
-#}
-
 {%- endif %}