diff --git a/cmd/start.go b/cmd/start.go
index 92803af6fd17221acbaf80896721f7faa2b7631a..f25910287a5ca78e0a7d9911281ac6453c385b3f 100644
--- a/cmd/start.go
+++ b/cmd/start.go
@@ -79,13 +79,11 @@ func init() {
 	startCmd.Flags().StringVarP(&bindAddress, "bind_address", "a", ":7030", "address to bind to")
 	startCmd.Flags().StringVarP(&logLevel, "log", "l", "debug", "loglevel")
 	startCmd.Flags().Bool("tls", false, "Use Viper for configuration")
-	startCmd.Flags().StringVarP(&osclient, "osclient", "o", "ubuntu", "os client to use by system")
 
 	viper.BindPFlag("bindAddress", startCmd.Flags().Lookup("bind_address"))
 	viper.BindPFlag("configFile", startCmd.Flags().Lookup("config"))
 	viper.BindPFlag("logLevel", startCmd.Flags().Lookup("log"))
 	viper.BindPFlag("useTLS", startCmd.Flags().Lookup("tls"))
-	viper.BindPFlag("osclient", startCmd.Flags().Lookup("osclient"))
 
 	rootCmd.AddCommand(startCmd)
 }
diff --git a/gnmitarget/target.go b/gnmitarget/target.go
index adc1b0f5b8f1291782b5530d1618c7d7530c7c35..998f1d4d226257b810f8b4741f12c94f9cab6478 100644
--- a/gnmitarget/target.go
+++ b/gnmitarget/target.go
@@ -2,6 +2,7 @@ package gnmitarget
 
 import (
 	"fmt"
+	"runtime"
 
 	"code.fbi.h-da.de/danet/gnmi-target/gnmiserver"
 	"code.fbi.h-da.de/danet/gnmi-target/os_clients"
@@ -41,8 +42,8 @@ type GnmiTarget struct {
 func NewGnmiTarget(osclient string) (*GnmiTarget, error) {
 	var os os_clients.Osclient
 	var err error
-	switch osclient {
-	case "ubuntu":
+	switch runtime.GOOS {
+	case "linux":
 		os, err = ubuntu.NewOsclientUbuntu()
 		if err != nil {
 			return nil, err
@@ -98,7 +99,7 @@ func (gt *GnmiTarget) Start(bindAddress string) error {
 		log.Fatalf("Failed to list due to: %v", err)
 	}
 
-	log.Info("Target ist starting to serve requests")
+	log.Info("Target is starting to serve requests")
 	err = grpcServer.Serve(listener)
 	if err != nil {
 		log.Fatalf("Failed to serve requests due to: %v", err)