diff --git a/cdist/conf/type/__zypper_repo/gencode-remote b/cdist/conf/type/__zypper_repo/gencode-remote
index 005166c9..26199c75 100644
--- a/cdist/conf/type/__zypper_repo/gencode-remote
+++ b/cdist/conf/type/__zypper_repo/gencode-remote
@@ -25,7 +25,7 @@
 #exec >&2
 #set -x
 
-zypper_def_opts=" -q "
+zypper_def_opts=" -q --non-interactive --gpg-auto-import-keys "
 
 if [ -f "$__object/parameter/repo_desc" ]; then
    desc="$(cat "$__object/parameter/repo_desc")"
diff --git a/cdist/conf/type/__zypper_service/gencode-remote b/cdist/conf/type/__zypper_service/gencode-remote
index ebd5fc5c..d16ba8ee 100644
--- a/cdist/conf/type/__zypper_service/gencode-remote
+++ b/cdist/conf/type/__zypper_service/gencode-remote
@@ -25,7 +25,7 @@
 #exec >&2
 #set -x
 
-zypper_def_opts=" -q "
+zypper_def_opts=" -q --non-interactive --gpg-auto-import-keys "
 
 if [ -f "$__object/parameter/service_desc" ]; then
    desc="$(cat "$__object/parameter/service_desc")"
@@ -73,10 +73,12 @@ case "$state_should" in
    present)
          echo zypper $zypper_def_opts addservice -t "$stype" "$uri" \"$desc\"
          echo zypper $zypper_def_opts refs
+         echo zypper $zypper_def_opts ref
    ;;
    absent)
          echo zypper $zypper_def_opts removeservice "$service_id"
          echo zypper $zypper_def_opts refs
+         echo zypper $zypper_def_opts ref
    ;;
    *)
       echo "Unknown state: $state_should" >&2
diff --git a/cdist/conf/type/__zypper_service/manifest b/cdist/conf/type/__zypper_service/manifest
index b21f3f98..7f853b3b 100644
--- a/cdist/conf/type/__zypper_service/manifest
+++ b/cdist/conf/type/__zypper_service/manifest
@@ -25,7 +25,6 @@
 #exec >&2
 #set -x
 
-zypper_def_opts=" -q "
 
 if [ -f "$__object/parameter/uri" ]; then
    uri="$(cat "$__object/parameter/uri")"