diff --git a/AUTHORS b/AUTHORS
index 2f1b07aa..67aa1eb2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -79,3 +79,4 @@ List of contributors, in chronological order:
 * Ato Araki (https://github.com/atotto)
 * Roman Lebedev (https://github.com/LebedevRI)
 * Brian Witt (https://github.com/bwitt)
+* Ales Bregar (https://github.com/abregar)
diff --git a/utils/config_test.go b/utils/config_test.go
index 19fd0b52..1bb2ffed 100644
--- a/utils/config_test.go
+++ b/utils/config_test.go
@@ -19,8 +19,8 @@ func (s *ConfigSuite) TestLoadConfig(c *C) {
 	_, _ = f.WriteString(configFile)
 	_ = f.Close()
 
-	// start with empty config
-	s.config = ConfigStructure{}
+        // start with empty config
+        s.config = ConfigStructure{}
 
 	err := LoadConfig(configname, &s.config)
 	c.Assert(err, IsNil)
@@ -32,8 +32,8 @@ func (s *ConfigSuite) TestLoadConfig(c *C) {
 func (s *ConfigSuite) TestSaveConfig(c *C) {
 	configname := filepath.Join(c.MkDir(), "aptly.json2")
 
-	// start with empty config
-	s.config = ConfigStructure{}
+        // start with empty config
+        s.config = ConfigStructure{}
 
 	s.config.RootDir = "/tmp/aptly"
 	s.config.DownloadConcurrency = 5
@@ -71,94 +71,94 @@ func (s *ConfigSuite) TestSaveConfig(c *C) {
 	_, _ = f.Read(buf)
 
 	c.Check(string(buf), Equals, ""+
-		"{\n"+
-		"  \"rootDir\": \"/tmp/aptly\",\n"+
-		"  \"logLevel\": \"info\",\n"+
-		"  \"logFormat\": \"json\",\n"+
-		"  \"databaseOpenAttempts\": 5,\n"+
-		"  \"architectures\": null,\n"+
-		"  \"skipLegacyPool\": false,\n"+
-		"  \"dependencyFollowSuggests\": false,\n"+
-		"  \"dependencyFollowRecommends\": false,\n"+
-		"  \"dependencyFollowAllVariants\": false,\n"+
-		"  \"dependencyFollowSource\": false,\n"+
-		"  \"dependencyVerboseResolve\": false,\n"+
-		"  \"ppaDistributorID\": \"\",\n"+
-		"  \"ppaCodename\": \"\",\n"+
-		"  \"serveInAPIMode\": false,\n"+
-		"  \"enableMetricsEndpoint\": false,\n"+
-		"  \"enableSwaggerEndpoint\": false,\n"+
-		"  \"AsyncAPI\": false,\n"+
-		"  \"databaseBackend\": {\n"+
-		"    \"type\": \"\",\n"+
-		"    \"dbPath\": \"\",\n"+
-		"    \"url\": \"\"\n"+
-		"  },\n"+
-		"  \"downloader\": \"\",\n"+
-		"  \"downloadConcurrency\": 5,\n"+
-		"  \"downloadSpeedLimit\": 0,\n"+
-		"  \"downloadRetries\": 0,\n"+
-		"  \"downloadSourcePackages\": false,\n"+
-		"  \"gpgProvider\": \"gpg\",\n"+
-		"  \"gpgDisableSign\": false,\n"+
-		"  \"gpgDisableVerify\": false,\n"+
-		"  \"gpgKeys\": null,\n"+
-		"  \"skipContentsPublishing\": false,\n"+
-		"  \"skipBz2Publishing\": false,\n"+
-		"  \"FileSystemPublishEndpoints\": {\n"+
-		"    \"test\": {\n"+
-		"      \"rootDir\": \"/opt/aptly-publish\",\n"+
-		"      \"linkMethod\": \"\",\n"+
-		"      \"verifyMethod\": \"\"\n"+
-		"    }\n"+
-		"  },\n"+
-		"  \"S3PublishEndpoints\": {\n"+
-		"    \"test\": {\n"+
-		"      \"region\": \"us-east-1\",\n"+
-		"      \"bucket\": \"repo\",\n"+
-		"      \"prefix\": \"\",\n"+
-		"      \"acl\": \"\",\n"+
-		"      \"awsAccessKeyID\": \"\",\n"+
-		"      \"awsSecretAccessKey\": \"\",\n"+
-		"      \"awsSessionToken\": \"\",\n"+
-		"      \"endpoint\": \"\",\n"+
-		"      \"storageClass\": \"\",\n"+
-		"      \"encryptionMethod\": \"\",\n"+
-		"      \"plusWorkaround\": false,\n"+
-		"      \"disableMultiDel\": false,\n"+
-		"      \"forceSigV2\": false,\n"+
-		"      \"forceVirtualHostedStyle\": false,\n"+
-		"      \"debug\": false\n"+
-		"    }\n"+
-		"  },\n"+
-		"  \"SwiftPublishEndpoints\": {\n"+
-		"    \"test\": {\n"+
-		"      \"container\": \"repo\",\n"+
-		"      \"prefix\": \"\",\n"+
-		"      \"osname\": \"\",\n"+
-		"      \"password\": \"\",\n"+
-		"      \"tenant\": \"\",\n"+
-		"      \"tenantid\": \"\",\n"+
-		"      \"domain\": \"\",\n"+
-		"      \"domainid\": \"\",\n"+
-		"      \"tenantdomain\": \"\",\n"+
-		"      \"tenantdomainid\": \"\",\n"+
-		"      \"authurl\": \"\"\n"+
-		"    }\n"+
-		"  },\n"+
-		"  \"AzurePublishEndpoints\": {\n"+
-		"    \"test\": {\n"+
-		"      \"container\": \"repo\",\n"+
-		"      \"prefix\": \"\",\n"+
-		"      \"accountName\": \"\",\n"+
-		"      \"accountKey\": \"\",\n"+
-		"      \"endpoint\": \"\"\n"+
-		"    }\n"+
-		"  },\n"+
-		"  \"packagePoolStorage\": {\n"+
-		"    \"type\": \"local\",\n"+
-		"    \"path\": \"/tmp/aptly-pool\"\n"+
-		"  }\n"+
+		"{\n" +
+		"  \"rootDir\": \"/tmp/aptly\",\n" +
+		"  \"logLevel\": \"info\",\n" +
+		"  \"logFormat\": \"json\",\n" +
+		"  \"databaseOpenAttempts\": 5,\n" +
+		"  \"architectures\": null,\n" +
+		"  \"skipLegacyPool\": false,\n" +
+		"  \"dependencyFollowSuggests\": false,\n" +
+		"  \"dependencyFollowRecommends\": false,\n" +
+		"  \"dependencyFollowAllVariants\": false,\n" +
+		"  \"dependencyFollowSource\": false,\n" +
+		"  \"dependencyVerboseResolve\": false,\n" +
+		"  \"ppaDistributorID\": \"\",\n" +
+		"  \"ppaCodename\": \"\",\n" +
+		"  \"serveInAPIMode\": false,\n" +
+		"  \"enableMetricsEndpoint\": false,\n" +
+		"  \"enableSwaggerEndpoint\": false,\n" +
+		"  \"AsyncAPI\": false,\n" +
+		"  \"databaseBackend\": {\n" +
+		"    \"type\": \"\",\n" +
+		"    \"dbPath\": \"\",\n" +
+		"    \"url\": \"\"\n" +
+		"  },\n" +
+		"  \"downloader\": \"\",\n" +
+		"  \"downloadConcurrency\": 5,\n" +
+		"  \"downloadSpeedLimit\": 0,\n" +
+		"  \"downloadRetries\": 0,\n" +
+		"  \"downloadSourcePackages\": false,\n" +
+		"  \"gpgProvider\": \"gpg\",\n" +
+		"  \"gpgDisableSign\": false,\n" +
+		"  \"gpgDisableVerify\": false,\n" +
+		"  \"gpgKeys\": null,\n" +
+		"  \"skipContentsPublishing\": false,\n" +
+		"  \"skipBz2Publishing\": false,\n" +
+		"  \"FileSystemPublishEndpoints\": {\n" +
+		"    \"test\": {\n" +
+		"      \"rootDir\": \"/opt/aptly-publish\",\n" +
+		"      \"linkMethod\": \"\",\n" +
+		"      \"verifyMethod\": \"\"\n" +
+		"    }\n" +
+		"  },\n" +
+		"  \"S3PublishEndpoints\": {\n" +
+		"    \"test\": {\n" +
+		"      \"region\": \"us-east-1\",\n" +
+		"      \"bucket\": \"repo\",\n" +
+		"      \"prefix\": \"\",\n" +
+		"      \"acl\": \"\",\n" +
+		"      \"awsAccessKeyID\": \"\",\n" +
+		"      \"awsSecretAccessKey\": \"\",\n" +
+		"      \"awsSessionToken\": \"\",\n" +
+		"      \"endpoint\": \"\",\n" +
+		"      \"storageClass\": \"\",\n" +
+		"      \"encryptionMethod\": \"\",\n" +
+		"      \"plusWorkaround\": false,\n" +
+		"      \"disableMultiDel\": false,\n" +
+		"      \"forceSigV2\": false,\n" +
+		"      \"forceVirtualHostedStyle\": false,\n" +
+		"      \"debug\": false\n" +
+		"    }\n" +
+		"  },\n" +
+		"  \"SwiftPublishEndpoints\": {\n" +
+		"    \"test\": {\n" +
+		"      \"container\": \"repo\",\n" +
+		"      \"prefix\": \"\",\n" +
+		"      \"osname\": \"\",\n" +
+		"      \"password\": \"\",\n" +
+		"      \"tenant\": \"\",\n" +
+		"      \"tenantid\": \"\",\n" +
+		"      \"domain\": \"\",\n" +
+		"      \"domainid\": \"\",\n" +
+		"      \"tenantdomain\": \"\",\n" +
+		"      \"tenantdomainid\": \"\",\n" +
+		"      \"authurl\": \"\"\n" +
+		"    }\n" +
+		"  },\n" +
+		"  \"AzurePublishEndpoints\": {\n" +
+		"    \"test\": {\n" +
+		"      \"container\": \"repo\",\n" +
+		"      \"prefix\": \"\",\n" +
+		"      \"accountName\": \"\",\n" +
+		"      \"accountKey\": \"\",\n" +
+		"      \"endpoint\": \"\"\n" +
+		"    }\n" +
+		"  },\n" +
+		"  \"packagePoolStorage\": {\n" +
+		"    \"type\": \"local\",\n" +
+		"    \"path\": \"/tmp/aptly-pool\"\n" +
+		"  }\n" +
 		"}")
 }
 
@@ -168,8 +168,8 @@ func (s *ConfigSuite) TestLoadYAMLConfig(c *C) {
 	_, _ = f.WriteString(configFileYAML)
 	_ = f.Close()
 
-	// start with empty config
-	s.config = ConfigStructure{}
+        // start with empty config
+        s.config = ConfigStructure{}
 
 	err := LoadConfig(configname, &s.config)
 	c.Assert(err, IsNil)
@@ -184,8 +184,8 @@ func (s *ConfigSuite) TestLoadYAMLErrorConfig(c *C) {
 	_, _ = f.WriteString(configFileYAMLError)
 	_ = f.Close()
 
-	// start with empty config
-	s.config = ConfigStructure{}
+        // start with empty config
+        s.config = ConfigStructure{}
 
 	err := LoadConfig(configname, &s.config)
 	c.Assert(err.Error(), Equals, "invalid yaml (unknown pool storage type: invalid) or json (invalid character 'p' looking for beginning of value)")
@@ -197,13 +197,13 @@ func (s *ConfigSuite) TestSaveYAMLConfig(c *C) {
 	_, _ = f.WriteString(configFileYAML)
 	_ = f.Close()
 
-	// start with empty config
-	s.config = ConfigStructure{}
+        // start with empty config
+        s.config = ConfigStructure{}
 
 	err := LoadConfig(configname, &s.config)
 	c.Assert(err, IsNil)
 
-	err = SaveConfigYAML(configname, &s.config)
+        err = SaveConfigYAML(configname, &s.config)
 	c.Assert(err, IsNil)
 
 	f, _ = os.Open(configname)
@@ -219,17 +219,17 @@ func (s *ConfigSuite) TestSaveYAMLConfig(c *C) {
 }
 
 func (s *ConfigSuite) TestSaveYAML2Config(c *C) {
-	// start with empty config
-	s.config = ConfigStructure{}
+        // start with empty config
+        s.config = ConfigStructure{}
 
 	s.config.PackagePoolStorage.Local = &LocalPoolStorage{"/tmp/aptly-pool"}
-	s.config.PackagePoolStorage.Azure = nil
+        s.config.PackagePoolStorage.Azure = nil
 
 	configname := filepath.Join(c.MkDir(), "aptly.yaml4")
-	err := SaveConfigYAML(configname, &s.config)
+        err := SaveConfigYAML(configname, &s.config)
 	c.Assert(err, IsNil)
 
-	f, _ := os.Open(configname)
+        f, _ := os.Open(configname)
 	defer func() {
 		_ = f.Close()
 	}()
@@ -238,45 +238,45 @@ func (s *ConfigSuite) TestSaveYAML2Config(c *C) {
 	buf := make([]byte, st.Size())
 	_, _ = f.Read(buf)
 
-	c.Check(string(buf), Equals, ""+
-		"root_dir: \"\"\n"+
-		"log_level: \"\"\n"+
-		"log_format: \"\"\n"+
-		"database_open_attempts: 0\n"+
-		"architectures: []\n"+
-		"skip_legacy_pool: false\n"+
-		"dep_follow_suggests: false\n"+
-		"dep_follow_recommends: false\n"+
-		"dep_follow_all_variants: false\n"+
-		"dep_follow_source: false\n"+
-		"dep_verboseresolve: false\n"+
-		"ppa_distributor_id: \"\"\n"+
-		"ppa_codename: \"\"\n"+
-		"serve_in_api_mode: false\n"+
-		"enable_metrics_endpoint: false\n"+
-		"enable_swagger_endpoint: false\n"+
-		"async_api: false\n"+
-		"database_backend:\n"+
-		"    type: \"\"\n"+
-		"    db_path: \"\"\n"+
-		"    url: \"\"\n"+
-		"downloader: \"\"\n"+
-		"download_concurrency: 0\n"+
-		"download_limit: 0\n"+
-		"download_retries: 0\n"+
-		"download_sourcepackages: false\n"+
-		"gpg_provider: \"\"\n"+
-		"gpg_disable_sign: false\n"+
-		"gpg_disable_verify: false\n"+
-		"gpg_keys: []\n"+
-		"skip_contents_publishing: false\n"+
-		"skip_bz2_publishing: false\n"+
-		"filesystem_publish_endpoints: {}\n"+
-		"s3_publish_endpoints: {}\n"+
-		"swift_publish_endpoints: {}\n"+
-		"azure_publish_endpoints: {}\n"+
-		"packagepool_storage:\n"+
-		"    type: local\n"+
+	c.Check(string(buf), Equals, "" +
+		"root_dir: \"\"\n" +
+		"log_level: \"\"\n" +
+		"log_format: \"\"\n" +
+		"database_open_attempts: 0\n" +
+		"architectures: []\n" +
+		"skip_legacy_pool: false\n" +
+		"dep_follow_suggests: false\n" +
+		"dep_follow_recommends: false\n" +
+		"dep_follow_all_variants: false\n" +
+		"dep_follow_source: false\n" +
+		"dep_verboseresolve: false\n" +
+		"ppa_distributor_id: \"\"\n" +
+		"ppa_codename: \"\"\n" +
+		"serve_in_api_mode: false\n" +
+		"enable_metrics_endpoint: false\n" +
+		"enable_swagger_endpoint: false\n" +
+		"async_api: false\n" +
+		"database_backend:\n" +
+		"    type: \"\"\n" +
+		"    db_path: \"\"\n" +
+		"    url: \"\"\n" +
+		"downloader: \"\"\n" +
+		"download_concurrency: 0\n" +
+		"download_limit: 0\n" +
+		"download_retries: 0\n" +
+		"download_sourcepackages: false\n" +
+		"gpg_provider: \"\"\n" +
+		"gpg_disable_sign: false\n" +
+		"gpg_disable_verify: false\n" +
+		"gpg_keys: []\n" +
+		"skip_contents_publishing: false\n" +
+		"skip_bz2_publishing: false\n" +
+		"filesystem_publish_endpoints: {}\n" +
+		"s3_publish_endpoints: {}\n" +
+		"swift_publish_endpoints: {}\n" +
+		"azure_publish_endpoints: {}\n" +
+		"packagepool_storage:\n" +
+		"    type: local\n" +
 		"    path: /tmp/aptly-pool\n")
 }
 
@@ -285,8 +285,8 @@ func (s *ConfigSuite) TestLoadEmptyConfig(c *C) {
 	f, _ := os.Create(configname)
 	_ = f.Close()
 
-	// start with empty config
-	s.config = ConfigStructure{}
+        // start with empty config
+        s.config = ConfigStructure{}
 
 	err := LoadConfig(configname, &s.config)
 	c.Assert(err.Error(), Equals, "invalid yaml (EOF) or json (EOF)")
@@ -379,4 +379,4 @@ packagepool_storage:
 `
 const configFileYAMLError = `packagepool_storage:
     type: invalid
-`
+`
\ No newline at end of file