diff --git a/variants/backend-base/app/template.rb b/variants/backend-base/app/template.rb
index f7f40b6c..0ed045dd 100644
--- a/variants/backend-base/app/template.rb
+++ b/variants/backend-base/app/template.rb
@@ -18,5 +18,5 @@
 
 # Configure the default mailer to use the our default from address
 gsub_file! "app/mailers/application_mailer.rb",
-           "default from: 'from@example.com'",
+           /default from: ['"]from@example\.com['"]/,
            "default from: Rails.application.config.app.mail_from"
diff --git a/variants/backend-base/config/application.rb b/variants/backend-base/config/application.rb
index 5ff263cd..b4eabfd4 100644
--- a/variants/backend-base/config/application.rb
+++ b/variants/backend-base/config/application.rb
@@ -1,5 +1,5 @@
 gsub_file! "config/application.rb",
-           "# config.time_zone = 'Central Time (US & Canada)'",
+           /# config.time_zone = ['"]Central Time \(US & Canada\)['"]/,
            "config.time_zone = 'Wellington'"
 
 insert_into_file "config/application.rb", after: /^require_relative ['"]boot['"]/ do
diff --git a/variants/backend-base/config/environments/development.rb b/variants/backend-base/config/environments/development.rb
index 9a849ee1..6f0be190 100644
--- a/variants/backend-base/config/environments/development.rb
+++ b/variants/backend-base/config/environments/development.rb
@@ -15,10 +15,6 @@
   RUBY
 end
 
-gsub_file! "config/environments/development.rb",
-           "join('tmp', 'caching-dev.txt')",
-           'join("tmp/caching-dev.txt")'
-
 gsub_file! "config/environments/development.rb",
            "config.action_controller.raise_on_missing_callback_actions = true",
            "# config.action_controller.raise_on_missing_callback_actions = true"
diff --git a/variants/backend-base/config/environments/production.rb b/variants/backend-base/config/environments/production.rb
index a8bec866..eeea4680 100644
--- a/variants/backend-base/config/environments/production.rb
+++ b/variants/backend-base/config/environments/production.rb
@@ -9,7 +9,7 @@
 end
 
 gsub_file! "config/environments/production.rb",
-           "# config.force_ssl = true",
+           "config.force_ssl = true",
            <<~RUBY
              ##
              # `force_ssl` defaults to on. Set `force_ssl` to false if (and only if) RAILS_FORCE_SSL=false, otherwise set it to true.
@@ -43,8 +43,8 @@
 end
 
 gsub_file! "config/environments/production.rb",
-           "config.log_level = :info",
-           'config.log_level = ENV.fetch("LOG_LEVEL", "info").to_sym'
+           'ENV.fetch("RAILS_LOG_LEVEL", "info")',
+           'ENV.fetch("RAILS_LOG_LEVEL", ENV.fetch("LOG_LEVEL", "info"))'
 
 gsub_file! "config/environments/production.rb",
            "ActiveSupport::Logger.new(STDOUT)",
diff --git a/variants/backend-base/config/environments/test.rb b/variants/backend-base/config/environments/test.rb
index 2da14cce..78442c97 100644
--- a/variants/backend-base/config/environments/test.rb
+++ b/variants/backend-base/config/environments/test.rb
@@ -1,7 +1,3 @@
-gsub_file! "config/environments/test.rb",
-           "config.eager_load = false",
-           "config.eager_load = defined?(SimpleCov).present?"
-
 insert_into_file \
   "config/environments/test.rb",
   after: /config\.action_mailer\.delivery_method = :test\n/ do
diff --git a/variants/backend-base/config/template.rb b/variants/backend-base/config/template.rb
index 05b5c00c..268333a7 100644
--- a/variants/backend-base/config/template.rb
+++ b/variants/backend-base/config/template.rb
@@ -17,9 +17,9 @@
 copy_file "variants/backend-base/config/initializers/check_env.rb", "config/initializers/check_env.rb"
 copy_file "variants/backend-base/config/initializers/sentry.rb", "config/initializers/sentry.rb"
 
-gsub_file! "config/initializers/filter_parameter_logging.rb", /\[:password\]/ do
-  "%w[password secret session cookie csrf]"
-end
+gsub_file! "config/initializers/filter_parameter_logging.rb",
+           / {2}:passw, :secret, /,
+           "  :passw, :secret, :session, :cookie, :csrf, "
 
 apply "variants/backend-base/config/environments/development.rb"
 apply "variants/backend-base/config/environments/production.rb"
diff --git a/variants/devise/template.rb b/variants/devise/template.rb
index 8ecf28bc..d0e27339 100644
--- a/variants/devise/template.rb
+++ b/variants/devise/template.rb
@@ -28,11 +28,8 @@
            "      # t.datetime :locked_at",
            "      t.datetime :locked_at"
 gsub_file! devise_migration_path,
-           "      # add_index :users, :unlock_token",
-           "      add_index :users, :unlock_token"
-gsub_file! devise_migration_path,
-           /  # add_index :users, :unlock_token.+/,
-           "  add_index :users, :unlock_token, unique: true"
+           "    # add_index :users, :unlock_token",
+           "    add_index :users, :unlock_token"
 
 TERMINAL.puts_header "Running db migration"
 run "bundle exec rails db:migrate"
diff --git a/variants/frontend-base/sentry/template.rb b/variants/frontend-base/sentry/template.rb
index 975c6c84..a0505bb0 100644
--- a/variants/frontend-base/sentry/template.rb
+++ b/variants/frontend-base/sentry/template.rb
@@ -46,7 +46,3 @@
     //
   EO_JS
 end
-
-gsub_file! "config/initializers/content_security_policy.rb",
-           /# policy.report_uri ".+"/,
-           'policy.report_uri(ENV["SENTRY_CSP_HEADER_REPORT_ENDPOINT"]) if ENV["SENTRY_CSP_HEADER_REPORT_ENDPOINT"]'
diff --git a/variants/frontend-base/template.rb b/variants/frontend-base/template.rb
index 4e54959a..cd01e3f4 100644
--- a/variants/frontend-base/template.rb
+++ b/variants/frontend-base/template.rb
@@ -32,10 +32,9 @@
 run "mv app/javascript app/frontend"
 copy_file "config/webpack/webpack.config.js", force: true
 
-gsub_file! "config/shakapacker.yml", "source_entry_path: /", "source_entry_path: packs", force: true
-gsub_file! "config/shakapacker.yml", "cache_path: tmp/shakapacker", "cache_path: tmp/cache/shakapacker", force: true
-gsub_file! "config/shakapacker.yml", "source_path: app/javascript", "source_path: app/frontend", force: true
-gsub_file! "config/shakapacker.yml", "ensure_consistent_versioning: false", "ensure_consistent_versioning: true", force: true
+gsub_file! "config/shakapacker.yml", "cache_path: tmp/shakapacker", "cache_path: tmp/cache/shakapacker"
+gsub_file! "config/shakapacker.yml", "source_path: app/javascript", "source_path: app/frontend"
+gsub_file! "config/shakapacker.yml", "ensure_consistent_versioning: false", "ensure_consistent_versioning: true"
 
 old_shakapacker_test_compile_snippet = <<~EO_OLD
   test:
diff --git a/variants/frontend-react-typescript/template.rb b/variants/frontend-react-typescript/template.rb
index c2d1c6d0..16382f4b 100644
--- a/variants/frontend-react-typescript/template.rb
+++ b/variants/frontend-react-typescript/template.rb
@@ -17,7 +17,7 @@
 copy_file "app/frontend/components/HelloWorld.tsx", force: true
 gsub_file!(
   "app/views/home/index.html.erb",
-  'react_component("HelloWorld", { greeting: "Hello from react-rails." })',
+  'react_component("HelloWorld", { initialGreeting: "Hello from react-rails." })',
   'react_component("home/index")'
 )
 
diff --git a/variants/frontend-react/template.rb b/variants/frontend-react/template.rb
index 0f1d8b74..eb900447 100644
--- a/variants/frontend-react/template.rb
+++ b/variants/frontend-react/template.rb
@@ -65,7 +65,7 @@
 # import ReactRailsUJS from 'react_ujs';
 
 gsub_file! "app/views/layouts/application.html.erb",
-           "    <%= javascript_pack_tag \"application\", \"data-turbolinks-track\": \"reload\", defer: true %>\n",
+           "    <%= javascript_pack_tag \"application\", \"data-turbolinks-track\": \"reload\", defer: true, nonce: true %>\n",
            "    <%= javascript_pack_tag \"application\" %>\n"
 
 copy_file "jest.config.js"