diff --git a/internal/jws/jws.go b/internal/jws/jws.go
index ba10fea77ff606e78349867f567f1743674b4c93..778e331db8b114d97f3ee9fde95bc3fe1c5717b5 100644
--- a/internal/jws/jws.go
+++ b/internal/jws/jws.go
@@ -37,11 +37,11 @@ func GenerateKeyPair() (sk, pk interface{}, err error) {
 		return nil, nil, fmt.Errorf("unknown signing algorithm '%s'", alg)
 	}
 	if err != nil {
-		switch sk.(type) {
+		switch sk := sk.(type) {
 		case *rsa.PrivateKey:
-			pk = &sk.(*rsa.PrivateKey).PublicKey
+			pk = &sk.PublicKey
 		case *ecdsa.PrivateKey:
-			pk = &sk.(*ecdsa.PrivateKey).PublicKey
+			pk = &sk.PublicKey
 		default:
 			err = fmt.Errorf("something went wrong, we just created an unknown key type")
 		}
@@ -51,11 +51,11 @@ func GenerateKeyPair() (sk, pk interface{}, err error) {
 
 // ExportPrivateKeyAsPemStr exports the private key
 func ExportPrivateKeyAsPemStr(sk interface{}) string {
-	switch sk.(type) {
+	switch sk := sk.(type) {
 	case *rsa.PrivateKey:
-		return exportRSAPrivateKeyAsPemStr(sk.(*rsa.PrivateKey))
+		return exportRSAPrivateKeyAsPemStr(sk)
 	case *ecdsa.PrivateKey:
-		return exportECPrivateKeyAsPemStr(sk.(*ecdsa.PrivateKey))
+		return exportECPrivateKeyAsPemStr(sk)
 	default:
 		return ""
 	}
diff --git a/shared/utils/utils.go b/shared/utils/utils.go
index 01acac8a11f9d4c72f67df230b21f828c7981433..7b694d535a595b549a510a50260c449e790d2900 100644
--- a/shared/utils/utils.go
+++ b/shared/utils/utils.go
@@ -222,9 +222,9 @@ func StructToStringMap(st interface{}, tag string) map[string]string {
 	m := make(map[string]string)
 	for k, v := range s.Map() {
 		var str string
-		switch v.(type) {
+		switch v := v.(type) {
 		case string:
-			str = v.(string)
+			str = v
 		default:
 			str = fmt.Sprintf("%v", v)
 		}