diff --git a/data/templates/default/issues_index.html b/data/templates/default/issues_index.html
index 8917e571..b307f027 100644
--- a/data/templates/default/issues_index.html
+++ b/data/templates/default/issues_index.html
@@ -32,8 +32,4 @@ <h3>{{maintainer}}<a name="{{maintainer_anchor}}"></a></h3>
       {{/summaries}}
 {{/partial}}
 
-{{#partial}}{ float_right }
-<small>Last updated on: {{time}}</small>
-{{/partial}}
-
 {{> base}}
diff --git a/data/templates/default/issues_page.html b/data/templates/default/issues_page.html
index 7ad32e8a..fdc09ebf 100644
--- a/data/templates/default/issues_page.html
+++ b/data/templates/default/issues_page.html
@@ -1,9 +1,5 @@
 {{#partial}}{title}Issues for {{package_name}} in {{suite}}/{{section}}{{/partial}}
 
-{{#partial}}{ float_right }
-<small>Last updated on: {{time}}</small>
-{{/partial}}
-
 {{#partial}}{ header_content }
 <span style="font-size:18px;"><a href="index.html" style="color: #000000;">⇦ |</a></span>
 
diff --git a/data/templates/default/metainfo_index.html b/data/templates/default/metainfo_index.html
index c6ee0c6b..80672f4f 100644
--- a/data/templates/default/metainfo_index.html
+++ b/data/templates/default/metainfo_index.html
@@ -30,8 +30,4 @@ <h3>{{maintainer}}<a name="{{maintainer_anchor}}"></a></h3>
 
 {{/partial}}
 
-{{#partial}}{ float_right }
-<small>Last updated on: {{time}}</small>
-{{/partial}}
-
 {{> base}}
diff --git a/data/templates/default/metainfo_page.html b/data/templates/default/metainfo_page.html
index 73792e9e..784739d7 100644
--- a/data/templates/default/metainfo_page.html
+++ b/data/templates/default/metainfo_page.html
@@ -1,9 +1,5 @@
 {{#partial}}{title}{{package_name}} in {{suite}}/{{section}}{{/partial}}
 
-{{#partial}}{ float_right }
-<small>Last updated on: {{time}}</small>
-{{/partial}}
-
 {{#partial}}{ head_extra }
 <link rel="stylesheet" href="{{root_url}}/static/css/highlight.css">
 <script src="{{root_url}}/static/js/highlight/highlight.pack.js"></script>
diff --git a/data/templates/default/section_overview.html b/data/templates/default/section_overview.html
index 2b2ba7c5..ba3bafe0 100644
--- a/data/templates/default/section_overview.html
+++ b/data/templates/default/section_overview.html
@@ -164,8 +164,4 @@ <h3>Global data validation result</h3>
 
 {{/partial}}
 
-{{#partial}}{ float_right }
-<small>Last updated on: {{time}}</small>
-{{/partial}}
-
 {{> base}}
diff --git a/data/templates/default/sections_index.html b/data/templates/default/sections_index.html
index 753e234e..cff8937f 100644
--- a/data/templates/default/sections_index.html
+++ b/data/templates/default/sections_index.html
@@ -123,8 +123,4 @@ <h2>Health of suite "{{suite}}"</h2>
 
 {{/partial}}
 
-{{#partial}}{ float_right }
-<small>Last updated on: {{time}}</small>
-{{/partial}}
-
 {{> base}}
diff --git a/source/archive.d b/source/archive.d
index 579b2e51..b299f0bf 100644
--- a/source/archive.d
+++ b/source/archive.d
@@ -374,10 +374,13 @@ void compressAndSave (ubyte[] data, string fname, ArchiveType atype)
 void saveCompressed (string fname, ArchiveType atype)
 {
     import std.process;
+    import std.datetime : SysTime, unixTimeToStdTime;
 
     Pid pid;
     File cf;
     if (atype == ArchiveType.GZIP) {
+        SysTime epoch = unixTimeToStdTime (0);
+        std.file.setTimes (fname, epoch, epoch); // Ensure repeatable result
         cf = File (fname ~ ".gz", "w");
         pid = spawnProcess (["gzip", "-c", fname], std.stdio.stdin, cf);
     } else {
@@ -395,6 +398,7 @@ class ArchiveCompressor
 
 private:
     string archiveFname;
+    ArchiveType archiveType;
     archive *ar;
     bool closed;
 
@@ -402,13 +406,8 @@ public:
 
     this (ArchiveType type)
     {
+        archiveType = type;
         ar = archive_write_new ();
-
-        if (type == ArchiveType.GZIP)
-            archive_write_add_filter_gzip (ar);
-        else
-            archive_write_add_filter_xz (ar);
-
         archive_write_set_format_pax_restricted (ar);
         closed = true;
     }
@@ -434,6 +433,9 @@ public:
             return;
         archive_write_close (ar);
         closed = true;
+
+        saveCompressed (archiveFname, archiveType);
+        std.file.remove (archiveFname);
     }
 
     void addFile (string fname, string dest = null)
diff --git a/source/engine.d b/source/engine.d
index ed52d3c6..446e2c9d 100644
--- a/source/engine.d
+++ b/source/engine.d
@@ -228,12 +228,12 @@ public:
         if (withIconTar) {
             foreach (size; iconTarSizes) {
                 iconTar[size] = new ArchiveCompressor (ArchiveType.GZIP);
-                iconTar[size].open (buildPath (dataExportDir, format ("icons-%sx%s.tar.gz", size, size)));
+                iconTar[size].open (buildPath (dataExportDir, format ("icons-%sx%s.tar", size, size)));
             }
         }
 
         // collect metadata, icons and hints for the given packages
-        foreach (ref pkg; parallel (pkgs, 100)) {
+        foreach (ref pkg; pkgs) {
             auto pkid = Package.getId (pkg);
             auto gcids = dcache.getGCIDsForPackage (pkid);
             if (gcids !is null) {