diff --git a/proxy/config/http.go b/proxy/config/http.go
index a86726e..aaf494c 100644
--- a/proxy/config/http.go
+++ b/proxy/config/http.go
@@ -16,8 +16,8 @@ const tag = "latest"
 type HTTPProxyConfig struct {
 	RegistryURL  string `env:"REGISTRY_URL" envDefault:"localhost:5000"`
 	Authenticate bool   `env:"AUTHENTICATE" envDefault:"false"`
-	Username     string `env:"USERNAME" envDefault:""`
-	Password     string `env:"PASSWORD" envDefault:""`
+	Username     string `env:"USERNAME"     envDefault:""`
+	Password     string `env:"PASSWORD"     envDefault:""`
 }
 
 func LoadHTTPConfig(opts env.Options) (*HTTPProxyConfig, error) {
diff --git a/proxy/config/mqtt.go b/proxy/config/mqtt.go
index 95490ed..35843d9 100644
--- a/proxy/config/mqtt.go
+++ b/proxy/config/mqtt.go
@@ -6,7 +6,7 @@ import (
 
 type MQTTProxyConfig struct {
 	BrokerURL string `env:"BROKER_URL" envDefault:""`
-	Password  string `env:"PASSWORD" envDefault:""`
+	Password  string `env:"PASSWORD"   envDefault:""`
 	PropletID string `env:"PROPLET_ID" envDefault:""`
 	ChannelID string `env:"CHANNEL_ID" envDefault:""`
 }
diff --git a/proxy/mqtt/mqtt.go b/proxy/mqtt/mqtt.go
index 7851380..07efbcd 100644
--- a/proxy/mqtt/mqtt.go
+++ b/proxy/mqtt/mqtt.go
@@ -69,7 +69,7 @@ func (c *RegistryClient) Subscribe(ctx context.Context, containerChan chan<- str
 	handler := func(client mqtt.Client, msg mqtt.Message) {
 		data := msg.Payload()
 
-		var payLoad = struct {
+		payLoad := struct {
 			Appname string `json:"app_name"`
 		}{
 			Appname: "",