diff --git a/pkg/config/config.go b/pkg/config/config.go
index 2a6ef79..7767e5b 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -34,11 +34,8 @@ type Config struct {
 // Creates a new config with default parameters.
 func New() Config {
 	return Config{
-		Version: "",
-		SmdClient: client.SmdClient{
-			Host: "http://127.0.0.1",
-			Port: 27779,
-		},
+		Version:   "",
+		SmdClient: client.SmdClient{Host: "http://127.0.0.1:27779"},
 		Targets: map[string]configurator.Target{
 			"dnsmasq": configurator.Target{
 				Plugin:        "",
@@ -59,8 +56,7 @@ func New() Config {
 
 		PluginDirs: []string{},
 		Server: Server{
-			Host: "127.0.0.1",
-			Port: 3334,
+			Host: "127.0.0.1:3334",
 			Jwks: Jwks{
 				Uri:     "",
 				Retries: 5,
diff --git a/pkg/server/server.go b/pkg/server/server.go
index 689a0fd..24822ed 100644
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -58,9 +58,7 @@ func New(conf *config.Config) *Server {
 	// return based on config values
 	return &Server{
 		Config: conf,
-		Server: &http.Server{
-			Addr: fmt.Sprintf("%s:%d", conf.Server.Host, conf.Server.Port),
-		},
+		Server: &http.Server{Addr: fmt.Sprintf("%s", conf.Server.Host)},
 		Jwks: Jwks{
 			Uri:     conf.Server.Jwks.Uri,
 			Retries: conf.Server.Jwks.Retries,