diff --git a/CHANGELOG.md b/CHANGELOG.md
index 345898de6..3f43f7d41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Breaking Changes
+
+- Fixed the SDK creating warnings before initializing when loading the options. This will require you to reassign the option configuration in the editor configuration window. ([#1128](https://github.com/getsentry/sentry-unity/pull/1128))
+
 ### Fixes
 
 - Removed build GUID from automated release creation to keep events from different layers in the same release ([#1127](https://github.com/getsentry/sentry-unity/pull/1127))
diff --git a/samples/unity-of-bugs/Assets/Editor.meta b/samples/unity-of-bugs/Assets/Editor.meta
deleted file mode 100644
index f015e46ea..000000000
--- a/samples/unity-of-bugs/Assets/Editor.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: cd20b2f937c2a8f42941ebf4c691803f
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/samples/unity-of-bugs/Assets/Plugins/Sentry/SentryBuildtimeOptionsConfiguration.asset b/samples/unity-of-bugs/Assets/Resources/Sentry/SentryBuildtimeOptionsConfiguration.asset
similarity index 100%
rename from samples/unity-of-bugs/Assets/Plugins/Sentry/SentryBuildtimeOptionsConfiguration.asset
rename to samples/unity-of-bugs/Assets/Resources/Sentry/SentryBuildtimeOptionsConfiguration.asset
diff --git a/samples/unity-of-bugs/Assets/Plugins/Sentry/SentryBuildtimeOptionsConfiguration.asset.meta b/samples/unity-of-bugs/Assets/Resources/Sentry/SentryBuildtimeOptionsConfiguration.asset.meta
similarity index 100%
rename from samples/unity-of-bugs/Assets/Plugins/Sentry/SentryBuildtimeOptionsConfiguration.asset.meta
rename to samples/unity-of-bugs/Assets/Resources/Sentry/SentryBuildtimeOptionsConfiguration.asset.meta
diff --git a/samples/unity-of-bugs/Assets/Resources/Sentry/SentryOptions.asset b/samples/unity-of-bugs/Assets/Resources/Sentry/SentryOptions.asset
index e3b9a6324..c4021f72f 100644
--- a/samples/unity-of-bugs/Assets/Resources/Sentry/SentryOptions.asset
+++ b/samples/unity-of-bugs/Assets/Resources/Sentry/SentryOptions.asset
@@ -47,7 +47,7 @@ MonoBehaviour:
   <MacosNativeSupportEnabled>k__BackingField: 1
   <LinuxNativeSupportEnabled>k__BackingField: 1
   <Il2CppLineNumberSupportEnabled>k__BackingField: 1
-  <OptionsConfiguration>k__BackingField: {fileID: 11400000, guid: 407b4d5f2fef2c845bf2a3dcdf6b00fb,
+  <RuntimeOptionsConfiguration>k__BackingField: {fileID: 11400000, guid: 407b4d5f2fef2c845bf2a3dcdf6b00fb,
     type: 2}
   <BuildtimeOptionsConfiguration>k__BackingField: {fileID: 11400000, guid: 6bcc81a646c08ce439ab03805d477458,
     type: 2}
diff --git a/samples/unity-of-bugs/Assets/Editor/SentryBuildtimeOptionsConfiguration.cs b/samples/unity-of-bugs/Assets/Scripts/BuildtimeOptionsConfiguration.cs
similarity index 57%
rename from samples/unity-of-bugs/Assets/Editor/SentryBuildtimeOptionsConfiguration.cs
rename to samples/unity-of-bugs/Assets/Scripts/BuildtimeOptionsConfiguration.cs
index f1ccae2c2..f12e74626 100644
--- a/samples/unity-of-bugs/Assets/Editor/SentryBuildtimeOptionsConfiguration.cs
+++ b/samples/unity-of-bugs/Assets/Scripts/BuildtimeOptionsConfiguration.cs
@@ -1,10 +1,8 @@
-using System;
 using UnityEngine;
 using Sentry.Unity;
-using Sentry.Unity.Editor;
 
-[CreateAssetMenu(fileName = "Assets/Plugins/Sentry/SentryBuildtimeOptionsConfiguration.asset", menuName = "Sentry/Assets/Plugins/Sentry/SentryBuildtimeOptionsConfiguration.asset", order = 999)]
-public class SentryBuildtimeOptionsConfiguration : Sentry.Unity.Editor.ScriptableOptionsConfiguration
+[CreateAssetMenu(fileName = "Assets/Resources/Sentry/BuildtimeOptionsConfiguration.asset", menuName = "Sentry/BuildtimeOptionsConfiguration.asset", order = 999)]
+public class BuildtimeOptionsConfiguration : SentryBuildtimeOptionsConfiguration
 {
     /// See base class for documentation.
     /// Learn more at https://docs.sentry.io/platforms/unity/configuration/options/#programmatic-configuration
diff --git a/samples/unity-of-bugs/Assets/Editor/SentryBuildtimeOptionsConfiguration.cs.meta b/samples/unity-of-bugs/Assets/Scripts/BuildtimeOptionsConfiguration.cs.meta
similarity index 100%
rename from samples/unity-of-bugs/Assets/Editor/SentryBuildtimeOptionsConfiguration.cs.meta
rename to samples/unity-of-bugs/Assets/Scripts/BuildtimeOptionsConfiguration.cs.meta
diff --git a/samples/unity-of-bugs/Assets/Scripts/SentryRuntimeOptionsConfiguration.cs b/samples/unity-of-bugs/Assets/Scripts/RuntimeOptionsConfiguration.cs
similarity index 62%
rename from samples/unity-of-bugs/Assets/Scripts/SentryRuntimeOptionsConfiguration.cs
rename to samples/unity-of-bugs/Assets/Scripts/RuntimeOptionsConfiguration.cs
index 1f31c36f0..1db5c5abe 100644
--- a/samples/unity-of-bugs/Assets/Scripts/SentryRuntimeOptionsConfiguration.cs
+++ b/samples/unity-of-bugs/Assets/Scripts/RuntimeOptionsConfiguration.cs
@@ -1,9 +1,8 @@
-using System;
 using UnityEngine;
 using Sentry.Unity;
 
-[CreateAssetMenu(fileName = "Assets/Resources/Sentry/SentryRuntimeOptionsConfiguration.asset", menuName = "Sentry/Assets/Resources/Sentry/SentryRuntimeOptionsConfiguration.asset", order = 999)]
-public class SentryRuntimeOptionsConfiguration : Sentry.Unity.ScriptableOptionsConfiguration
+[CreateAssetMenu(fileName = "Assets/Resources/Sentry/RuntimeOptionsConfiguration.asset", menuName = "Sentry/RuntimeOptionsConfiguration", order = 999)]
+public class RuntimeOptionsConfiguration : SentryRuntimeOptionsConfiguration
 {
     /// See base class for documentation.
     /// Learn more at https://docs.sentry.io/platforms/unity/configuration/options/#programmatic-configuration
@@ -11,7 +10,7 @@ public override void Configure(SentryUnityOptions options)
     {
         Debug.Log("SentryRuntimeOptionsConfiguration::Configure() called");
 
-        /// BeforeSend is only relevant at runtime. It wouldn't hurt to be set at build time, just wouldn't do anything.
+        // BeforeSend is only relevant at runtime. It wouldn't hurt to be set at build time, just wouldn't do anything.
         options.BeforeSend = sentryEvent =>
         {
             if (sentryEvent.Tags.ContainsKey("SomeTag"))
diff --git a/samples/unity-of-bugs/Assets/Scripts/SentryRuntimeOptionsConfiguration.cs.meta b/samples/unity-of-bugs/Assets/Scripts/RuntimeOptionsConfiguration.cs.meta
similarity index 100%
rename from samples/unity-of-bugs/Assets/Scripts/SentryRuntimeOptionsConfiguration.cs.meta
rename to samples/unity-of-bugs/Assets/Scripts/RuntimeOptionsConfiguration.cs.meta
diff --git a/src/Sentry.Unity.Editor/ConfigurationWindow/OptionsConfigurationTab.cs b/src/Sentry.Unity.Editor/ConfigurationWindow/OptionsConfigurationTab.cs
index fe434ba7a..a05acecb4 100644
--- a/src/Sentry.Unity.Editor/ConfigurationWindow/OptionsConfigurationTab.cs
+++ b/src/Sentry.Unity.Editor/ConfigurationWindow/OptionsConfigurationTab.cs
@@ -3,8 +3,6 @@
 using System.Text;
 using UnityEditor;
 using UnityEngine;
-using RuntimeConfiguration = Sentry.Unity.ScriptableOptionsConfiguration;
-using BuildtimeConfiguration = Sentry.Unity.Editor.ScriptableOptionsConfiguration;
 
 namespace Sentry.Unity.Editor.ConfigurationWindow
 {
@@ -41,10 +39,10 @@ public static void Display(ScriptableSentryUnityOptions options)
             );
 
             options.BuildtimeOptionsConfiguration = OptionsConfigurationItem.Display(
-                options.BuildtimeOptionsConfiguration as BuildtimeConfiguration,
+                options.BuildtimeOptionsConfiguration,
                 "Buildtime Options Script",
                 "SentryBuildtimeOptionsConfiguration"
-            ) as ScriptableObject;
+            );
         }
     }
 
@@ -71,21 +69,18 @@ internal static class OptionsConfigurationItem
             return result;
         }
 
-        private static string SentryAssetPath(string scriptName, bool isEditorScript) =>
-            string.Format("Assets/{0}/Sentry/{1}.asset", isEditorScript ? "Plugins" : "Resources", scriptName);
+        private static string SentryAssetPath(string scriptName) => $"Assets/Resources/Sentry/{scriptName}.asset";
 
         private static void CreateScript<T>(string fieldName, string scriptName)
         {
-            var isEditorScript = typeof(T) == typeof(BuildtimeConfiguration);
-            var directory = isEditorScript ? "Assets/Editor" : "Assets/Scripts";
-
+            const string directory = "Assets/Scripts";
             if (!AssetDatabase.IsValidFolder(directory))
             {
                 AssetDatabase.CreateFolder(Path.GetDirectoryName(directory), Path.GetFileName(directory));
             }
 
             var scriptPath = EditorUtility.SaveFilePanel(fieldName, directory, scriptName, "cs");
-            if (String.IsNullOrEmpty(scriptPath))
+            if (string.IsNullOrEmpty(scriptPath))
             {
                 return;
             }
@@ -99,21 +94,16 @@ private static void CreateScript<T>(string fieldName, string scriptName)
             scriptName = Path.GetFileNameWithoutExtension(scriptPath);
 
             var template = new StringBuilder();
-            template.AppendLine("using System;");
             template.AppendLine("using UnityEngine;");
             template.AppendLine("using Sentry.Unity;");
-            if (isEditorScript)
-            {
-                template.AppendLine("using Sentry.Unity.Editor;");
-            }
             template.AppendLine();
-            template.AppendFormat("[CreateAssetMenu(fileName = \"{0}\", menuName = \"Sentry/{0}\", order = 999)]\n", SentryAssetPath(scriptName, isEditorScript));
+            template.AppendFormat("[CreateAssetMenu(fileName = \"{0}\", menuName = \"Sentry/{1}\", order = 999)]\n", SentryAssetPath(scriptName), scriptName);
             template.AppendFormat("public class {0} : {1}\n", scriptName, typeof(T).FullName);
             template.AppendLine("{");
             template.AppendLine("    /// See base class for documentation.");
             template.AppendLine("    /// Learn more at https://docs.sentry.io/platforms/unity/configuration/options/#programmatic-configuration");
             template.AppendFormat("    public override void Configure(SentryUnityOptions options{0})\n",
-                                  typeof(T) == typeof(BuildtimeConfiguration) ? ", SentryCliOptions cliOptions" : "");
+                                  typeof(T) == typeof(SentryBuildtimeOptionsConfiguration) ? ", SentryCliOptions cliOptions" : "");
             template.AppendLine("    {");
             template.AppendLine("        // TODO implement");
             template.AppendLine("    }");
@@ -146,11 +136,11 @@ private static void OnScriptsReloaded()
             SetScript(scriptName);
         }
 
-        internal static void SetScript(String scriptNameWithoutExtension)
+        internal static void SetScript(string scriptNameWithoutExtension)
         {
             var optionsConfigurationObject = ScriptableObject.CreateInstance(scriptNameWithoutExtension);
-            var isEditorScript = optionsConfigurationObject is BuildtimeConfiguration;
-            AssetDatabase.CreateAsset(optionsConfigurationObject, SentryAssetPath(scriptNameWithoutExtension, isEditorScript));
+            var isEditorScript = optionsConfigurationObject is SentryBuildtimeOptionsConfiguration;
+            AssetDatabase.CreateAsset(optionsConfigurationObject, SentryAssetPath(scriptNameWithoutExtension));
             AssetDatabase.Refresh();
 
             var options = EditorWindow.GetWindow<SentryWindow>().Options;
@@ -158,18 +148,12 @@ internal static void SetScript(String scriptNameWithoutExtension)
             if (isEditorScript)
             {
                 // Don't overwrite already set OptionsConfiguration
-                if (options.BuildtimeOptionsConfiguration is null)
-                {
-                    options.BuildtimeOptionsConfiguration = optionsConfigurationObject;
-                }
+                options.BuildtimeOptionsConfiguration ??= optionsConfigurationObject as SentryBuildtimeOptionsConfiguration;
             }
             else
             {
                 // Don't overwrite already set OptionsConfiguration
-                if (options.OptionsConfiguration is null)
-                {
-                    options.OptionsConfiguration = optionsConfigurationObject as RuntimeConfiguration;
-                }
+                options.OptionsConfiguration ??= optionsConfigurationObject as SentryRuntimeOptionsConfiguration;
             }
         }
     }
diff --git a/src/Sentry.Unity.Editor/ScriptableSentryUnityOptionsEditor.cs b/src/Sentry.Unity.Editor/ScriptableSentryUnityOptionsEditor.cs
index 76eb97fa9..f5920ce08 100644
--- a/src/Sentry.Unity.Editor/ScriptableSentryUnityOptionsEditor.cs
+++ b/src/Sentry.Unity.Editor/ScriptableSentryUnityOptionsEditor.cs
@@ -71,8 +71,10 @@ public override void OnInspectorGUI()
             EditorGUILayout.Space();
 
             EditorGUILayout.LabelField("Options Configuration", EditorStyles.boldLabel);
-            EditorGUILayout.ObjectField(".NET (C#)", options.OptionsConfiguration,
-                typeof(ScriptableOptionsConfiguration), false);
+            EditorGUILayout.ObjectField("Runtime Configuration", options.OptionsConfiguration,
+                typeof(SentryRuntimeOptionsConfiguration), false);
+            EditorGUILayout.ObjectField("Buildtime Configuration", options.BuildtimeOptionsConfiguration,
+                typeof(SentryBuildtimeOptionsConfiguration), false);
 
             EditorGUILayout.Space();
             EditorGUI.DrawRect(EditorGUILayout.GetControlRect(false, 1), Color.gray);
diff --git a/src/Sentry.Unity.Editor/SentryScriptableObject.cs b/src/Sentry.Unity.Editor/SentryScriptableObject.cs
index d9b825e8c..c26a4926e 100644
--- a/src/Sentry.Unity.Editor/SentryScriptableObject.cs
+++ b/src/Sentry.Unity.Editor/SentryScriptableObject.cs
@@ -37,10 +37,13 @@ internal static (SentryUnityOptions?, SentryCliOptions?) ConfiguredBuildtimeOpti
             if (scriptableOptions is not null)
             {
                 options = scriptableOptions.ToSentryUnityOptions(isBuilding: true);
-                /// Must be non-nullable in the interface otherwise Unity script compilation fails...
+                // Must be non-nullable in the interface otherwise Unity script compilation fails...
                 cliOptions ??= ScriptableObject.CreateInstance<SentryCliOptions>();
-                var setupScript = scriptableOptions.BuildtimeOptionsConfiguration as Sentry.Unity.Editor.ScriptableOptionsConfiguration;
-                setupScript?.Configure(options, cliOptions);
+                var setupScript = scriptableOptions.BuildtimeOptionsConfiguration;
+                if (setupScript != null)
+                {
+                    setupScript.Configure(options, cliOptions);
+                }
             }
 
             return (options, cliOptions);
diff --git a/src/Sentry.Unity/ScriptableSentryUnityOptions.cs b/src/Sentry.Unity/ScriptableSentryUnityOptions.cs
index 3de62642b..bf8773190 100644
--- a/src/Sentry.Unity/ScriptableSentryUnityOptions.cs
+++ b/src/Sentry.Unity/ScriptableSentryUnityOptions.cs
@@ -2,6 +2,7 @@
 using Sentry.Extensibility;
 using Sentry.Unity.Integrations;
 using UnityEngine;
+using UnityEngine.Serialization;
 
 namespace Sentry.Unity
 {
@@ -75,10 +76,8 @@ public static string GetConfigPath(string? notDefaultConfigName = null)
         [field: SerializeField] public bool LinuxNativeSupportEnabled { get; set; } = true;
         [field: SerializeField] public bool Il2CppLineNumberSupportEnabled { get; set; } = true;
 
-        [field: SerializeField] public Sentry.Unity.ScriptableOptionsConfiguration? OptionsConfiguration { get; set; }
-
-        // Actual type is `Sentry.Unity.Editor.ScriptableOptionsConfiguration` but we can't reference it here because we don't depend on the editor Assembly.
-        [field: SerializeField] public ScriptableObject? BuildtimeOptionsConfiguration { get; set; }
+        [field: SerializeField] public SentryRuntimeOptionsConfiguration? OptionsConfiguration { get; set; }
+        [field: SerializeField] public SentryBuildtimeOptionsConfiguration? BuildtimeOptionsConfiguration { get; set; }
 
         [field: SerializeField] public bool Debug { get; set; } = true;
         [field: SerializeField] public bool DebugOnlyInEditor { get; set; } = true;
@@ -188,7 +187,10 @@ internal SentryUnityOptions ToSentryUnityOptions(bool isBuilding, ISentryUnityIn
 
             if (!isBuilding)
             {
-                OptionsConfiguration?.Configure(options);
+                if (OptionsConfiguration != null)
+                {
+                    OptionsConfiguration.Configure(options);
+                }
 
                 // Doing this after the configure callback to allow users to programmatically opt out
                 if (!application.IsEditor && options.Il2CppLineNumberSupportEnabled && unityInfo is not null)
diff --git a/src/Sentry.Unity.Editor/ScriptableOptionsConfiguration.cs b/src/Sentry.Unity/SentryBuildtimeOptionsConfiguration.cs
similarity index 71%
rename from src/Sentry.Unity.Editor/ScriptableOptionsConfiguration.cs
rename to src/Sentry.Unity/SentryBuildtimeOptionsConfiguration.cs
index 8a2e57c6f..79e53d49f 100644
--- a/src/Sentry.Unity.Editor/ScriptableOptionsConfiguration.cs
+++ b/src/Sentry.Unity/SentryBuildtimeOptionsConfiguration.cs
@@ -1,15 +1,15 @@
 using UnityEngine;
 
-namespace Sentry.Unity.Editor
+namespace Sentry.Unity
 {
-    public abstract class ScriptableOptionsConfiguration : ScriptableObject
+    public abstract class SentryBuildtimeOptionsConfiguration : ScriptableObject
     {
         /// <summary>
         /// Called during app build. Changes made here will affect build-time processing, symbol upload, etc.
         /// Additionally, because iOS, macOS and Android native error handling is configured at build time,
         /// you can make changes to these options here.
         /// </summary>
-        /// <seealso cref="Sentry.Unity.ScriptableOptionsConfiguration"/>
+        /// <seealso cref="SentryRuntimeOptionsConfiguration"/>
         public abstract void Configure(SentryUnityOptions options, SentryCliOptions cliOptions);
     }
 }
diff --git a/src/Sentry.Unity.Editor/SentryCliOptions.cs b/src/Sentry.Unity/SentryCliOptions.cs
similarity index 98%
rename from src/Sentry.Unity.Editor/SentryCliOptions.cs
rename to src/Sentry.Unity/SentryCliOptions.cs
index 3d8657ab5..4747d9439 100644
--- a/src/Sentry.Unity.Editor/SentryCliOptions.cs
+++ b/src/Sentry.Unity/SentryCliOptions.cs
@@ -2,7 +2,7 @@
 using Sentry.Extensibility;
 using UnityEngine;
 
-namespace Sentry.Unity.Editor
+namespace Sentry.Unity
 {
     [Serializable]
     public sealed class SentryCliOptions : ScriptableObject
diff --git a/src/Sentry.Unity/ScriptableOptionsConfiguration.cs b/src/Sentry.Unity/SentryRuntimeOptionsConfiguration.cs
similarity index 71%
rename from src/Sentry.Unity/ScriptableOptionsConfiguration.cs
rename to src/Sentry.Unity/SentryRuntimeOptionsConfiguration.cs
index 5645efa5a..7f00e121f 100644
--- a/src/Sentry.Unity/ScriptableOptionsConfiguration.cs
+++ b/src/Sentry.Unity/SentryRuntimeOptionsConfiguration.cs
@@ -2,14 +2,14 @@
 
 namespace Sentry.Unity
 {
-    public abstract class ScriptableOptionsConfiguration : ScriptableObject
+    public abstract class SentryRuntimeOptionsConfiguration : ScriptableObject
     {
         /// <summary>
         /// Called at the player startup by SentryInitialization.
         /// You can alter configuration for the C# error handling and also
         /// native error handling in platforms other than iOS, macOS and Android.
         /// </summary>
-        /// <seealso cref="Sentry.Unity.Editor.ScriptableOptionsConfiguration"/>
+        /// <seealso cref="SentryBuildtimeOptionsConfiguration"/>
         public abstract void Configure(SentryUnityOptions options);
     }
 }
diff --git a/test/Scripts.Integration.Test/Editor/BuildtimeOptions.cs b/test/Scripts.Integration.Test/Editor/BuildtimeOptions.cs
index d0d2425a3..41142da27 100644
--- a/test/Scripts.Integration.Test/Editor/BuildtimeOptions.cs
+++ b/test/Scripts.Integration.Test/Editor/BuildtimeOptions.cs
@@ -5,7 +5,7 @@
 using UnityEditor;
 
 [CreateAssetMenu(fileName = "Assets/Resources/Sentry/BuildtimeOptions.cs", menuName = "Sentry/BuildtimeOptions", order = 999)]
-public class BuildtimeOptions : Sentry.Unity.Editor.ScriptableOptionsConfiguration
+public class BuildtimeOptions : SentryBuildtimeOptionsConfiguration
 {
     public override void Configure(SentryUnityOptions options, SentryCliOptions cliOptions)
     {
diff --git a/test/Scripts.Integration.Test/Scripts/RuntimeOptions.cs b/test/Scripts.Integration.Test/Scripts/RuntimeOptions.cs
index 8a3d01f2a..084fe1ae9 100644
--- a/test/Scripts.Integration.Test/Scripts/RuntimeOptions.cs
+++ b/test/Scripts.Integration.Test/Scripts/RuntimeOptions.cs
@@ -3,7 +3,7 @@
 using UnityEngine;
 
 [CreateAssetMenu(fileName = "Assets/Resources/Sentry/RuntimeOptions.cs", menuName = "Sentry/RuntimeOptions", order = 999)]
-public class RuntimeOptions : ScriptableOptionsConfiguration
+public class RuntimeOptions : SentryRuntimeOptionsConfiguration
 {
     public override void Configure(SentryUnityOptions options)
     {
diff --git a/test/Scripts.Integration.Test/configure-sentry.ps1 b/test/Scripts.Integration.Test/configure-sentry.ps1
index 81bc2f050..bfbe478a1 100644
--- a/test/Scripts.Integration.Test/configure-sentry.ps1
+++ b/test/Scripts.Integration.Test/configure-sentry.ps1
@@ -27,6 +27,6 @@ function AssertPathExists([string] $Path)
 }
 
 AssertPathExists "$NewProjectAssetsPath/Plugins/Sentry/SentryCliOptions.asset"
-AssertPathExists "$NewProjectAssetsPath/Plugins/Sentry/BuildtimeOptions.asset"
+AssertPathExists "$NewProjectAssetsPath/Resources/Sentry/BuildtimeOptions.asset"
 AssertPathExists "$NewProjectAssetsPath/Resources/Sentry/SentryOptions.asset"
 AssertPathExists "$NewProjectAssetsPath/Resources/Sentry/RuntimeOptions.asset"
diff --git a/test/Scripts.Integration.Test/integration-test.ps1 b/test/Scripts.Integration.Test/integration-test.ps1
index b0a5d287b..4a90e3ad4 100644
--- a/test/Scripts.Integration.Test/integration-test.ps1
+++ b/test/Scripts.Integration.Test/integration-test.ps1
@@ -20,7 +20,7 @@ If ($IsMacOS)
 {
     $UnityPath = "/Applications/Unity/Hub/Editor/$UnityVersion*/Unity.app/"
 }
-elseif ($IsWindows)
+Elseif ($IsWindows)
 {
     $UnityPath = "C:/Program Files/Unity/Hub/Editor/$UnityVersion/Editor/Unity.exe"
 }
@@ -72,19 +72,24 @@ If (-not(Test-Path -Path "$NewProjectPath") -Or $Recreate)
 
 $buildDir = "Samples/IntegrationTest/Build"
 
-if ($Rebuild -or -not(Test-Path -Path $buildDir))
+If ($Rebuild -or -not(Test-Path -Path $buildDir))
 {
     Write-Host "Building Project"
-    ./test/Scripts.Integration.Test/build-project.ps1 -UnityPath "$UnityPath" -UnityVersion $UnityVersion -Platform $Platform
-    if ($Platform -eq "iOS")
+
+    If ($Platform -eq "iOS")
     {
+        ./test/Scripts.Integration.Test/build-project.ps1 -UnityPath "$UnityPath" -UnityVersion $UnityVersion -Platform $Platform
         ./scripts/smoke-test-ios.ps1 Build -IsIntegrationTest -UnityVersion $UnityVersion
     }
+    Else 
+    {
+        ./test/Scripts.Integration.Test/build-project.ps1 -UnityPath "$UnityPath" -CheckSymbols -UnityVersion $UnityVersion -Platform $Platform
+    }
 }
 
 Write-Host "Running tests"
 
-switch -Regex ($Platform)
+Switch -Regex ($Platform)
 {
     "^(Windows|MacOS|Linux)$"
     {
diff --git a/test/Scripts.Tests/package-release.zip.snapshot b/test/Scripts.Tests/package-release.zip.snapshot
index 2eaab1c56..3e6d968ea 100644
--- a/test/Scripts.Tests/package-release.zip.snapshot
+++ b/test/Scripts.Tests/package-release.zip.snapshot
@@ -69,8 +69,8 @@ Plugins/iOS/Sentry.xcframework~/ios-arm64_x86_64-simulator/Sentry.framework/Head
 Plugins/iOS/Sentry.xcframework~/ios-arm64_x86_64-simulator/Sentry.framework/Headers/SentryEvent.h
 Plugins/iOS/Sentry.xcframework~/ios-arm64_x86_64-simulator/Sentry.framework/Headers/SentryException.h
 Plugins/iOS/Sentry.xcframework~/ios-arm64_x86_64-simulator/Sentry.framework/Headers/SentryFrame.h
-Plugins/iOS/Sentry.xcframework~/ios-arm64_x86_64-simulator/Sentry.framework/Headers/SentryHub.h
 Plugins/iOS/Sentry.xcframework~/ios-arm64_x86_64-simulator/Sentry.framework/Headers/SentryHttpStatusCodeRange.h
+Plugins/iOS/Sentry.xcframework~/ios-arm64_x86_64-simulator/Sentry.framework/Headers/SentryHub.h
 Plugins/iOS/Sentry.xcframework~/ios-arm64_x86_64-simulator/Sentry.framework/Headers/SentryId.h
 Plugins/iOS/Sentry.xcframework~/ios-arm64_x86_64-simulator/Sentry.framework/Headers/SentryIntegrationProtocol.h
 Plugins/iOS/Sentry.xcframework~/ios-arm64_x86_64-simulator/Sentry.framework/Headers/SentryMeasurementUnit.h
@@ -134,8 +134,8 @@ Plugins/iOS/Sentry.xcframework~/ios-arm64/Sentry.framework/Headers/SentryError.h
 Plugins/iOS/Sentry.xcframework~/ios-arm64/Sentry.framework/Headers/SentryEvent.h
 Plugins/iOS/Sentry.xcframework~/ios-arm64/Sentry.framework/Headers/SentryException.h
 Plugins/iOS/Sentry.xcframework~/ios-arm64/Sentry.framework/Headers/SentryFrame.h
-Plugins/iOS/Sentry.xcframework~/ios-arm64/Sentry.framework/Headers/SentryHub.h
 Plugins/iOS/Sentry.xcframework~/ios-arm64/Sentry.framework/Headers/SentryHttpStatusCodeRange.h
+Plugins/iOS/Sentry.xcframework~/ios-arm64/Sentry.framework/Headers/SentryHub.h
 Plugins/iOS/Sentry.xcframework~/ios-arm64/Sentry.framework/Headers/SentryId.h
 Plugins/iOS/Sentry.xcframework~/ios-arm64/Sentry.framework/Headers/SentryIntegrationProtocol.h
 Plugins/iOS/Sentry.xcframework~/ios-arm64/Sentry.framework/Headers/SentryMeasurementUnit.h
@@ -237,9 +237,6 @@ Runtime/SentryInitialization.cs
 Runtime/SentryInitialization.cs.meta
 Runtime/SentryIntegrations.cs
 Runtime/SentryIntegrations.cs.meta
-Samples~/unity-of-bugs/Editor.meta
-Samples~/unity-of-bugs/Editor/SentryBuildtimeOptionsConfiguration.cs
-Samples~/unity-of-bugs/Editor/SentryBuildtimeOptionsConfiguration.cs.meta
 Samples~/unity-of-bugs/Scenes.meta
 Samples~/unity-of-bugs/Scripts.meta
 Samples~/unity-of-bugs/Scenes/1_Bugfarm.unity
@@ -254,9 +251,11 @@ Samples~/unity-of-bugs/Scripts/AdditionalButtons.cs
 Samples~/unity-of-bugs/Scripts/AdditionalButtons.cs.meta
 Samples~/unity-of-bugs/Scripts/BugFarmButtons.cs
 Samples~/unity-of-bugs/Scripts/BugFarmButtons.cs.meta
-Samples~/unity-of-bugs/Scripts/SentryRuntimeOptionsConfiguration.cs
-Samples~/unity-of-bugs/Scripts/SentryRuntimeOptionsConfiguration.cs.meta
+Samples~/unity-of-bugs/Scripts/BuildtimeOptionsConfiguration.cs
+Samples~/unity-of-bugs/Scripts/BuildtimeOptionsConfiguration.cs.meta
 Samples~/unity-of-bugs/Scripts/NativeSupport.meta
+Samples~/unity-of-bugs/Scripts/RuntimeOptionsConfiguration.cs
+Samples~/unity-of-bugs/Scripts/RuntimeOptionsConfiguration.cs.meta
 Samples~/unity-of-bugs/Scripts/SceneButtons.cs
 Samples~/unity-of-bugs/Scripts/SceneButtons.cs.meta
 Samples~/unity-of-bugs/Scripts/ThreadingSamples.cs
diff --git a/test/Sentry.Unity.Tests/ScriptableSentryUnityOptionsTests.cs b/test/Sentry.Unity.Tests/ScriptableSentryUnityOptionsTests.cs
index 6bc1c4727..c256cab5d 100644
--- a/test/Sentry.Unity.Tests/ScriptableSentryUnityOptionsTests.cs
+++ b/test/Sentry.Unity.Tests/ScriptableSentryUnityOptionsTests.cs
@@ -20,7 +20,7 @@ class Fixture
                 persistentDataPath: "test/persistent/data/path");
         }
 
-        class TestOptionsConfiguration : ScriptableOptionsConfiguration
+        class TestOptionsConfiguration : SentryRuntimeOptionsConfiguration
         {
             public bool GotCalled;
             public override void Configure(SentryUnityOptions options) => GotCalled = true;