diff --git a/.aider.conf.yml b/.aider.conf.yml
new file mode 100644
index 0000000..4c022d0
--- /dev/null
+++ b/.aider.conf.yml
@@ -0,0 +1,31 @@
+#############
+# Main model:
+
+## Specify the model to use for the main chat
+# model: oca/gpt5
+model: oca/gpt-5.1-codex
+
+
+## Enable/disable automatic acceptance of architect changes (default: True)
+#auto-accept-architect: true
+
+weak-model: oca/llama4
+
+##################
+# Output settings:
+
+## Use colors suitable for a dark terminal background (default: False)
+dark-mode: true
+
+## Enable/disable auto commit of LLM changes (default: True)
+auto-commits: false
+
+
+############
+# Analytics:
+
+## Enable/disable analytics for current session (default: random)
+analytics: false
+
+## Permanently disable analytics
+analytics-disable: true
diff --git a/.codex/config.toml b/.codex/config.toml
new file mode 100644
index 0000000..8d835b1
--- /dev/null
+++ b/.codex/config.toml
@@ -0,0 +1,62 @@
+approval_policy = "on-failure"
+preferred_auth_method = "apikey"
+model = "oca/gpt-5-codex"
+profile = "gpt-5-codex"
+sandbox_mode = "workspace-write"
+web_search_request = true
+trust_level = "trusted"
+[model_providers.oca-responses]
+base_url = "https://code-internal.aiservice.us-chicago-1.oci.oraclecloud.com/20250206/app/litellm"
+http_headers = { "client" = "codex-cli", "client-version" = "0" }
+model = "oca/gpt5"
+name = "Oracle Code Assist Responses"
+wire_api = "responses"
+[model_providers.oca-chat]
+base_url = "https://code-internal.aiservice.us-chicago-1.oci.oraclecloud.com/20250206/app/litellm"
+http_headers = { "client" = "codex-cli", "client-version" = "0" }
+model = "oca/gpt5"
+name = "Oracle Code Assist Chat"
+wire_api = "responses"
+[profiles.grok-4]
+model = "oca/grok4"
+model_provider = "oca-chat"
+review_model = "oca/grok4"
+[profiles.grok-4-fast-reasoning]
+model = "oca/grok4-fast-reasoning"
+model_provider = "oca-chat"
+review_model = "oca/grok4-fast-reasoning"
+[profiles.grok-code-fast-1]
+model = "oca/grok-code-fast-1"
+model_provider = "oca-chat"
+review_model = "oca/grok-code-fast-1"
+[profiles.gpt-4-1]
+model = "oca/gpt-4.1"
+model_provider = "oca-chat"
+review_model = "oca/gpt-4.1"
+[profiles.gpt-5]
+model = "oca/gpt5"
+model_provider = "oca-responses"
+review_model = "oca/gpt5"
+[profiles.gpt-5-1]
+model = "oca/gpt-5.1"
+model_provider = "oca-chat"
+review_model = "oca/gpt-5.1"
+[profiles.gpt-5-2]
+model = "oca/gpt-5.2"
+model_provider = "oca-responses"
+review_model = "oca/gpt-5.2"
+[profiles.gpt-5-codex]
+model = "oca/gpt-5-codex"
+model_provider = "oca-responses"
+review_model = "oca/gpt-5-codex"
+personality = "pragmatic"
+[profiles.gpt-5-1-codex]
+model = "oca/gpt-5.1-codex"
+model_provider = "oca-responses"
+review_model = "oca/gpt-5.1-codex"
+personality = "pragmatic"
+[profiles.gpt-5-1-codex-mini]
+model = "oca/gpt-5.1-codex-mini"
+model_provider = "oca-responses"
+review_model = "oca/gpt-5.1-codex-mini"
+personality = "pragmatic"
diff --git a/.spacemacs b/.spacemacs
index eedef11..4176669 100644
--- a/.spacemacs
+++ b/.spacemacs
@@ -643,7 +643,7 @@ before packages are loaded."
         notmuch-search-oldest-first nil          ;; new email on top
         notmuch-column-control 1.0               ;; just one columnt for searches
         notmuch-hello-insert-recent-searches nil ;; don't display recent searches in notmuch-helo
-        notmuch-address-command "/Users/jetpac/bin/notmuch-address"
+        ;; notmuch-address-command "/Users/jetpac/bin/notmuch-address"
 
         ;; these are default
         ;; notmuch-hello-sections '(notmuch-hello-insert-header notmuch-hello-insert-saved-searches
diff --git a/.ssh/config.oci b/.ssh/config.oci
index fd51ae3..1882fca 100644
--- a/.ssh/config.oci
+++ b/.ssh/config.oci
@@ -14,3 +14,6 @@ Host dabel dabel.us.oracle.com andel andel.us.oracle.com gates gates.us.oracle.c
 	RequestTTY yes
 
 
+Host oci.private.devops.scmservice.us-phoenix-1.oci.oracleiaas.com
+      PKCS11Provider /Library/OpenSC/lib/opensc-pkcs11.so
+      User pnyc@bmc_operator_access
diff --git a/bin/retag-email b/bin/retag-email
index 5059a45..5cd58c5 100755
--- a/bin/retag-email
+++ b/bin/retag-email
@@ -258,6 +258,20 @@ notmuch tag +on +gkap +logs +s11u4-sru \
 notmuch tag +on +gkap +logs +s11u4-sru  \
         "tag:new AND tag:inbox AND (subject:GKAP or subject:GKAB)"
 
+notmuch tag +on +gkap +logs +s11u4-sru \
+        "tag:new AND to:rpe_gk_backport_ww_grp and subject:/pass.*on11u4.*scapen/"
+
+notmuch tag +on +gkap +logs +s11u4-sru \
+        "tag:new AND from:blduser@bld.us.oracle.com AND to:rpe_gk_backport_ww_grp"
+
+notmuch tag +on +gkap +logs +s11u4-sru \
+        "tag:new AND from:rpe_sme_ww_grp AND NOT
+                             (subject:/INTERIM.GK.Backport.*/ OR subject:/New.GK.backport.testing.has.started/ OR
+                              subject:/^.*GK.Backport.testing.has.completed/ OR
+                              subject:/INTERIM.GK.Backport.report.for/)"
+
+
+
 
 # notmuch tag +on +gkap +logs +s11u4-sru \
 #         tag:new AND from:rpe_sme_ww_grp@oracle.com AND subject:"/INTERIM.GK.Backport.report.for.GKAP_11.4.*/"