diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index e82b1c61..1e0a15d8 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -129,10 +129,7 @@ jobs:
           echo "Can't publish on NPM, You must first create a secret called NPM_TOKEN that contains your NPM auth token. https://help.github.com/en/actions/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets"
           false
         fi
-        EXTRA_ARGS=""
-        if [ "$IS_PRE_RELEASE" = "true" ]; then
-            EXTRA_ARGS="--tag next"
-        fi
+        EXTRA_ARGS="--tag v10"
         npm publish $EXTRA_ARGS
       env:
         NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
diff --git a/src/bin/keycloakify/generateFtl/kcContextDeclarationTemplate.ftl b/src/bin/keycloakify/generateFtl/kcContextDeclarationTemplate.ftl
index d61b6980..083f6251 100644
--- a/src/bin/keycloakify/generateFtl/kcContextDeclarationTemplate.ftl
+++ b/src/bin/keycloakify/generateFtl/kcContextDeclarationTemplate.ftl
@@ -166,6 +166,9 @@ function decodeHtmlEntities(htmlStr){
                 ) ||  (
                     ["masterAdminClient", "delegateForUpdate", "defaultRole"]?seq_contains(key) &&
                     areSamePath(path, ["realm"])
+                ) || (
+                        "smtpConfig" == key &&
+                        are_same_path(path, ["realm"])
                 ) || (
                     xKeycloakify.pageId == "error.ftl" &&
                     areSamePath(path, ["realm"]) &&