diff --git a/src/main/java/com/google/devtools/build/lib/packages/semantics/BuildLanguageOptions.java b/src/main/java/com/google/devtools/build/lib/packages/semantics/BuildLanguageOptions.java
index 47444580bf52ed..ebd3fd6e745673 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/semantics/BuildLanguageOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/semantics/BuildLanguageOptions.java
@@ -452,7 +452,7 @@ public final class BuildLanguageOptions extends OptionsBase {
 
   @Option(
       name = "incompatible_package_group_has_public_syntax",
-      defaultValue = "false",
+      defaultValue = "true",
       documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
       effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
       metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE},
@@ -463,7 +463,7 @@ public final class BuildLanguageOptions extends OptionsBase {
 
   @Option(
       name = "incompatible_fix_package_group_reporoot_syntax",
-      defaultValue = "false",
+      defaultValue = "true",
       documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
       effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
       metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE},
@@ -803,9 +803,9 @@ public StarlarkSemantics toStarlarkSemantics() {
   public static final String INCOMPATIBLE_DISALLOW_STRUCT_PROVIDER_SYNTAX =
       "-incompatible_disallow_struct_provider_syntax";
   public static final String INCOMPATIBLE_PACKAGE_GROUP_HAS_PUBLIC_SYNTAX =
-      "-incompatible_package_group_has_public_syntax";
+      "+incompatible_package_group_has_public_syntax";
   public static final String INCOMPATIBLE_FIX_PACKAGE_GROUP_REPOROOT_SYNTAX =
-      "-incompatible_fix_package_group_reporoot_syntax";
+      "+incompatible_fix_package_group_reporoot_syntax";
   public static final String INCOMPATIBLE_DO_NOT_SPLIT_LINKING_CMDLINE =
       "+incompatible_do_not_split_linking_cmdline";
   public static final String INCOMPATIBLE_JAVA_COMMON_PARAMETERS =
diff --git a/src/main/java/com/google/devtools/build/lib/query2/common/CommonQueryOptions.java b/src/main/java/com/google/devtools/build/lib/query2/common/CommonQueryOptions.java
index eb44883d47703f..0f93f23a65ed65 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/common/CommonQueryOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/common/CommonQueryOptions.java
@@ -139,7 +139,7 @@ public String getLineTerminator() {
 
   @Option(
       name = "incompatible_package_group_includes_double_slash",
-      defaultValue = "false",
+      defaultValue = "true",
       documentationCategory = OptionDocumentationCategory.QUERY,
       effectTags = {OptionEffectTag.TERMINAL_OUTPUT},
       metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE},
diff --git a/tools/allowlists/config_feature_flag/BUILD b/tools/allowlists/config_feature_flag/BUILD
index e8dcde9362a141..cdeb4a1bf7a5c1 100644
--- a/tools/allowlists/config_feature_flag/BUILD
+++ b/tools/allowlists/config_feature_flag/BUILD
@@ -2,11 +2,6 @@
 #   Package groups for restricting access to config_feature_flag to specific
 #   packages, allowing for careful rollout as it is an experimental feature.
 
-package_group(
-    name = "config_feature_flag",
-    packages = ["//..."],
-)
-
 filegroup(
     name = "srcs",
     srcs = glob(["**"]),
diff --git a/tools/allowlists/config_feature_flag/BUILD.tools b/tools/allowlists/config_feature_flag/BUILD.tools
new file mode 100644
index 00000000000000..19b8d34bf0d150
--- /dev/null
+++ b/tools/allowlists/config_feature_flag/BUILD.tools
@@ -0,0 +1,8 @@
+# Description:
+#   Package groups for restricting access to config_feature_flag to specific
+#   packages, allowing for careful rollout as it is an experimental feature.
+
+package_group(
+    name = "config_feature_flag",
+    packages = ["public"],
+)
\ No newline at end of file
diff --git a/tools/allowlists/function_transition_allowlist/BUILD b/tools/allowlists/function_transition_allowlist/BUILD
index 785b6381c92594..d29102d0b0085a 100644
--- a/tools/allowlists/function_transition_allowlist/BUILD
+++ b/tools/allowlists/function_transition_allowlist/BUILD
@@ -1,11 +1,6 @@
 # Description:
 #   Package group restricting access to starlark-defined transitions, allowing for careful rollout as it is an experimental feature.
 
-package_group(
-    name = "function_transition_allowlist",
-    packages = ["//..."],
-)
-
 filegroup(
     name = "srcs",
     srcs = glob(["**"]),
diff --git a/tools/allowlists/function_transition_allowlist/BUILD.tools b/tools/allowlists/function_transition_allowlist/BUILD.tools
new file mode 100644
index 00000000000000..b7f84664082347
--- /dev/null
+++ b/tools/allowlists/function_transition_allowlist/BUILD.tools
@@ -0,0 +1,7 @@
+# Description:
+#   Package group restricting access to starlark-defined transitions, allowing for careful rollout as it is an experimental feature.
+
+package_group(
+    name = "function_transition_allowlist",
+    packages = ["public"],
+)