diff --git a/README.md b/README.md
index a9b70de..63d7959 100644
--- a/README.md
+++ b/README.md
@@ -32,9 +32,9 @@ Flags:
   -u, --username string           Database username (default "vspheredb")
 
   datastore:
-    -s, --datastore string        Name of the datastore to check
+    --datastore string            Name of the datastore to check
   temperature:
-    -s, --sensor string           Sensor name filter (supports SQL LIKE pattern)
+    --sensor string               Sensor name filter (supports SQL LIKE pattern)
 ```
 
 ## Development
diff --git a/cmd/datastore.go b/cmd/datastore.go
index ee818b5..30e34c8 100644
--- a/cmd/datastore.go
+++ b/cmd/datastore.go
@@ -36,7 +36,7 @@ func init() {
 
 	datastoreCmd.Flags().StringVarP(&datastoreWarning, "warning", "w", "80", "Warning threshold in percent")
 	datastoreCmd.Flags().StringVarP(&datastoreCritical, "critical", "c", "90", "Critical threshold in percent")
-	datastoreCmd.Flags().StringVarP(&datastore, "datastore", "s", "", "Name of the datastore to check")
+	datastoreCmd.Flags().StringVarP(&datastore, "datastore", "", "", "Name of the datastore to check")
 }
 
 func queryDatastore() {
diff --git a/cmd/temperature.go b/cmd/temperature.go
index fe141e6..815d4d3 100644
--- a/cmd/temperature.go
+++ b/cmd/temperature.go
@@ -30,7 +30,7 @@ func init() {
 
 	temperatureCmd.Flags().StringVarP(&temperatureWarning, "warning", "w", "50", "Warning threshold")
 	temperatureCmd.Flags().StringVarP(&temperatureCritical, "critical", "c", "60", "Critical threshold")
-	temperatureCmd.Flags().StringVarP(&temperatureSensor, "sensor", "s", "%", "Sensor name filter (supports SQL LIKE pattern)")
+	temperatureCmd.Flags().StringVarP(&temperatureSensor, "sensor", "", "%", "Sensor name filter (supports SQL LIKE pattern)")
 }
 
 func queryTemperature() {
diff --git a/contrib/icinga2-basket.json b/contrib/icinga2-basket.json
index 5f1ad88..4643183 100644
--- a/contrib/icinga2-basket.json
+++ b/contrib/icinga2-basket.json
@@ -71,7 +71,7 @@
                     "description": "Critical threshold in percent as Integer (defaults to 90)",
                     "value": "$vspheredb_data_datastorecrit$"
                 },
-                "-s": {
+                "--datastore": {
                     "description": "Datastore to check",
                     "value": "$vspheredb_data_datastore$"
                 },
@@ -183,7 +183,7 @@
                     "description": "Critical threshold (defaults to 60)",
                     "value": "$vspheredb_data_tempcrit$"
                 },
-                "-s": {
+                "--sensor": {
                     "description": "Sensor name filter (supports SQL LIKE pattern)",
                     "value": "$vspheredb_data_tempsensor$"
                 },
@@ -209,4 +209,4 @@
             "timeout": 60
         }
     }
-}
\ No newline at end of file
+}
diff --git a/contrib/icinga2-commands.conf b/contrib/icinga2-commands.conf
index a703738..ddc0fb6 100644
--- a/contrib/icinga2-commands.conf
+++ b/contrib/icinga2-commands.conf
@@ -70,7 +70,7 @@ object CheckCommand "vspheredb_data_datastore" {
             description = "Warning threshold in percent as Integer (defaults to 80)"
             value = "$vspheredb_data_datastorewarn$"
         }
-        "-s" = {
+        "--datastore" = {
             description = "Datastore to check"
             value = "$vspheredb_data_datastore$"
         }
@@ -154,9 +154,9 @@ object CheckCommand "vspheredb_data_temperature" {
             description = "Warning threshold as Integer (less than X available) (defaults to 50)"
             value = "$vspheredb_data_nicwarn$"
         }
-        "-s" ) {
+        "--sensor" ) {
             description = "Sensor name filter (supports SQL LIKE pattern)"
             value = "$vspheredb_data_sensor$"
         }
     }
-}
\ No newline at end of file
+}