diff --git a/.rubocop_cc.yml b/.rubocop_cc.yml
index eb6d5da11f0..4f6ac8e5214 100644
--- a/.rubocop_cc.yml
+++ b/.rubocop_cc.yml
@@ -180,6 +180,8 @@ Lint/IncompatibleIoSelectWithFiberScheduler:
   Enabled: true
 Lint/LambdaWithoutLiteralBlock:
   Enabled: true
+Lint/LiteralAssignmentInCondition:
+  Enabled: true
 Lint/MixedCaseRange:
   Enabled: true
 Lint/NoReturnInBeginEndBlocks:
@@ -326,6 +328,8 @@ Style/SelectByRegexp:
   Enabled: true
 Style/StringChars:
   Enabled: true
+Style/SuperWithArgsParentheses:
+  Enabled: true
 Style/SwapValues:
   Enabled: true
 Style/YAMLFileRead:
diff --git a/Gemfile b/Gemfile
index 87041e5f1f2..e225cea7382 100644
--- a/Gemfile
+++ b/Gemfile
@@ -87,7 +87,7 @@ group :test do
   gem 'rspec-its'
   gem 'rspec-rails', '~> 6.1.0'
   gem 'rspec-wait'
-  gem 'rubocop', '~> 1.57.2'
+  gem 'rubocop', '~> 1.58.0'
   gem 'rubocop-rails', '~> 2.22'
   gem 'rubocop-rspec', '~> 2.25'
   gem 'rubocop-sequel', '~> 0.3.4'
diff --git a/Gemfile.lock b/Gemfile.lock
index 62c0d08c16c..681ba6959ef 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -271,7 +271,7 @@ GEM
     irb (1.7.4)
       reline (>= 0.3.6)
     jaro_winkler (1.5.4)
-    json (2.6.3)
+    json (2.7.0)
     json-diff (0.4.1)
     json-schema (4.1.1)
       addressable (>= 2.8)
@@ -441,7 +441,7 @@ GEM
       activesupport (>= 3.0.0)
       mustache (~> 1.0, >= 0.99.4)
       rspec (~> 3.0)
-    rubocop (1.57.2)
+    rubocop (1.58.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -449,7 +449,7 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.30.0)
@@ -629,7 +629,7 @@ DEPENDENCIES
   rspec-rails (~> 6.1.0)
   rspec-wait
   rspec_api_documentation (>= 6.1.0)
-  rubocop (~> 1.57.2)
+  rubocop (~> 1.58.0)
   rubocop-rails (~> 2.22)
   rubocop-rspec (~> 2.25)
   rubocop-sequel (~> 0.3.4)
diff --git a/app/access/app_event_access.rb b/app/access/app_event_access.rb
index bb7da454c04..42af127248a 100644
--- a/app/access/app_event_access.rb
+++ b/app/access/app_event_access.rb
@@ -7,7 +7,7 @@ def create?(_object, _params=nil)
     def read?(object)
       return @ok_read if instance_variable_defined?(:@ok_read)
 
-      @ok_read = (admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user))
+      @ok_read = admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user)
     end
 
     def read_for_update?(_object, _params=nil)
diff --git a/app/access/app_usage_event_access.rb b/app/access/app_usage_event_access.rb
index 07d2beba9b9..4c2965db66b 100644
--- a/app/access/app_usage_event_access.rb
+++ b/app/access/app_usage_event_access.rb
@@ -7,7 +7,7 @@ def create?(_object, _params=nil)
     def read?(object)
       return @ok_read if instance_variable_defined?(:@ok_read)
 
-      @ok_read = (admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user))
+      @ok_read = admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user)
     end
 
     def read_for_update?(_object, _params=nil)
diff --git a/app/access/base_access.rb b/app/access/base_access.rb
index 7c59399e181..0dabe8da924 100644
--- a/app/access/base_access.rb
+++ b/app/access/base_access.rb
@@ -7,7 +7,7 @@ class BaseAccess
     def read?(object)
       return @ok_read if instance_variable_defined?(:@ok_read)
 
-      @ok_read = (admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user))
+      @ok_read = admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user)
     end
 
     private
diff --git a/app/access/buildpack_access.rb b/app/access/buildpack_access.rb
index 58adca618fb..e1632421d3c 100644
--- a/app/access/buildpack_access.rb
+++ b/app/access/buildpack_access.rb
@@ -7,7 +7,7 @@ def create?(_object, _params=nil)
     def read?(object)
       return @ok_read if instance_variable_defined?(:@ok_read)
 
-      @ok_read = (admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user))
+      @ok_read = admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user)
     end
 
     def read_for_update?(_object, _params=nil)
diff --git a/app/access/event_access.rb b/app/access/event_access.rb
index 0b07da144c5..6fe7458a32e 100644
--- a/app/access/event_access.rb
+++ b/app/access/event_access.rb
@@ -7,7 +7,7 @@ def create?(_object, _params=nil)
     def read?(object)
       return @ok_read if instance_variable_defined?(:@ok_read)
 
-      @ok_read = (admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user))
+      @ok_read = admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user)
     end
 
     def read_for_update?(_object, _params=nil)
diff --git a/app/access/managed_service_instance_access.rb b/app/access/managed_service_instance_access.rb
index d5b39949b45..17393d0f144 100644
--- a/app/access/managed_service_instance_access.rb
+++ b/app/access/managed_service_instance_access.rb
@@ -3,7 +3,7 @@ class ManagedServiceInstanceAccess < ServiceInstanceAccess
     def read?(object)
       return @ok_read if instance_variable_defined?(:@ok_read)
 
-      @ok_read = (admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user))
+      @ok_read = admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user)
     end
 
     def can_remove_related_object?(object, params=nil)
diff --git a/app/access/private_domain_access.rb b/app/access/private_domain_access.rb
index c4a05e4b024..5d12ee04a40 100644
--- a/app/access/private_domain_access.rb
+++ b/app/access/private_domain_access.rb
@@ -3,7 +3,7 @@ class PrivateDomainAccess < BaseAccess
     def read?(object)
       return @ok_read if instance_variable_defined?(:@ok_read)
 
-      @ok_read = (admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user))
+      @ok_read = admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user)
     end
 
     def can_remove_related_object?(object, params=nil)
diff --git a/app/access/process_model_access.rb b/app/access/process_model_access.rb
index 9b676fc884a..48c8aeec575 100644
--- a/app/access/process_model_access.rb
+++ b/app/access/process_model_access.rb
@@ -3,7 +3,7 @@ class ProcessModelAccess < BaseAccess
     def read?(object)
       return @ok_read if instance_variable_defined?(:@ok_read)
 
-      @ok_read = (admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user))
+      @ok_read = admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user)
     end
 
     def can_remove_related_object?(object, params=nil)
diff --git a/app/access/quota_definition_access.rb b/app/access/quota_definition_access.rb
index 9c9cf3e19c3..3e2afc7c7b8 100644
--- a/app/access/quota_definition_access.rb
+++ b/app/access/quota_definition_access.rb
@@ -7,7 +7,7 @@ def create?(_object, _params=nil)
     def read?(object)
       return @ok_read if instance_variable_defined?(:@ok_read)
 
-      @ok_read = (admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user))
+      @ok_read = admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user)
     end
 
     def read_for_update?(_object, _params=nil)
diff --git a/app/access/route_mapping_access.rb b/app/access/route_mapping_access.rb
index 6efe30f55ac..85fec06a577 100644
--- a/app/access/route_mapping_access.rb
+++ b/app/access/route_mapping_access.rb
@@ -3,7 +3,7 @@ class RouteMappingModelAccess < BaseAccess
     def read?(object)
       return @ok_read if instance_variable_defined?(:@ok_read)
 
-      @ok_read = (admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user))
+      @ok_read = admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user)
     end
 
     def can_remove_related_object?(object, params=nil)
diff --git a/app/access/security_group_access.rb b/app/access/security_group_access.rb
index 519762698f7..2d5b96541f6 100644
--- a/app/access/security_group_access.rb
+++ b/app/access/security_group_access.rb
@@ -7,7 +7,7 @@ def create?(_object, _params=nil)
     def read?(object)
       return @ok_read if instance_variable_defined?(:@ok_read)
 
-      @ok_read = (admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user))
+      @ok_read = admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user)
     end
 
     def read_for_update?(_object, _params=nil)
diff --git a/app/access/service_access.rb b/app/access/service_access.rb
index 50cc9efe71a..1dbf2f70bc6 100644
--- a/app/access/service_access.rb
+++ b/app/access/service_access.rb
@@ -7,7 +7,7 @@ def create?(_object, _params=nil)
     def read?(object)
       return @ok_read if instance_variable_defined?(:@ok_read)
 
-      @ok_read = (admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user))
+      @ok_read = admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user)
     end
 
     def read_for_update?(_object, _params=nil)
diff --git a/app/access/service_binding_access.rb b/app/access/service_binding_access.rb
index a8029ef6020..9e32da98c6d 100644
--- a/app/access/service_binding_access.rb
+++ b/app/access/service_binding_access.rb
@@ -3,7 +3,7 @@ class ServiceBindingAccess < BaseAccess
     def read?(object)
       return @ok_read if instance_variable_defined?(:@ok_read)
 
-      @ok_read = (admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user))
+      @ok_read = admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user)
     end
 
     def read_for_update?(_object, _params=nil)
diff --git a/app/access/service_broker_access.rb b/app/access/service_broker_access.rb
index 919397d0aae..02f7e5a2a56 100644
--- a/app/access/service_broker_access.rb
+++ b/app/access/service_broker_access.rb
@@ -3,7 +3,7 @@ class ServiceBrokerAccess < BaseAccess
     def read?(object)
       return @ok_read if instance_variable_defined?(:@ok_read)
 
-      @ok_read = (admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user))
+      @ok_read = admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user)
     end
 
     def read_for_update?(_object, _params=nil)
diff --git a/app/access/service_instance_access.rb b/app/access/service_instance_access.rb
index d3d17d8b1ca..889b7e8e757 100644
--- a/app/access/service_instance_access.rb
+++ b/app/access/service_instance_access.rb
@@ -3,7 +3,7 @@ class ServiceInstanceAccess < BaseAccess
     def read?(object)
       return @ok_read if instance_variable_defined?(:@ok_read)
 
-      @ok_read = (admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user))
+      @ok_read = admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user)
     end
 
     def can_remove_related_object?(object, params=nil)
diff --git a/app/access/service_plan_access.rb b/app/access/service_plan_access.rb
index 3637098ff93..4b2b1dd91b5 100644
--- a/app/access/service_plan_access.rb
+++ b/app/access/service_plan_access.rb
@@ -7,7 +7,7 @@ def create?(_object, _params=nil)
     def read?(object)
       return @ok_read if instance_variable_defined?(:@ok_read)
 
-      @ok_read = (admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user))
+      @ok_read = admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user)
     end
 
     def read_for_update?(_object, _params=nil)
diff --git a/app/access/service_plan_visibility_access.rb b/app/access/service_plan_visibility_access.rb
index b8e99447f13..4dea787c5d8 100644
--- a/app/access/service_plan_visibility_access.rb
+++ b/app/access/service_plan_visibility_access.rb
@@ -7,7 +7,7 @@ def create?(_object, _params=nil)
     def read?(object)
       return @ok_read if instance_variable_defined?(:@ok_read)
 
-      @ok_read = (admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user))
+      @ok_read = admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user)
     end
 
     def read_for_update?(_object, _params=nil)
diff --git a/app/access/service_usage_event_access.rb b/app/access/service_usage_event_access.rb
index 437036b2428..ed8319d04fe 100644
--- a/app/access/service_usage_event_access.rb
+++ b/app/access/service_usage_event_access.rb
@@ -7,7 +7,7 @@ def create?(_object, _params=nil)
     def read?(object)
       return @ok_read if instance_variable_defined?(:@ok_read)
 
-      @ok_read = (admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user))
+      @ok_read = admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user)
     end
 
     def read_for_update?(_object, _params=nil)
diff --git a/app/access/stack_access.rb b/app/access/stack_access.rb
index a49609bbd42..bac1d580f56 100644
--- a/app/access/stack_access.rb
+++ b/app/access/stack_access.rb
@@ -7,7 +7,7 @@ def create?(_object, _params=nil)
     def read?(object)
       return @ok_read if instance_variable_defined?(:@ok_read)
 
-      @ok_read = (admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user))
+      @ok_read = admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user)
     end
 
     def read_for_update?(_object, _params=nil)
diff --git a/app/actions/space_diff_manifest.rb b/app/actions/space_diff_manifest.rb
index dd03954d7bd..579df049b60 100644
--- a/app/actions/space_diff_manifest.rb
+++ b/app/actions/space_diff_manifest.rb
@@ -205,7 +205,7 @@ def remove_default_missing_fields(existing_value, current_key, value)
           if manifest_app_hash_resource.nil?
             existing_value.delete_at(i)
           else
-            resource.each do |k, _v|
+            resource.each_key do |k|
               existing_value[i].delete(k) if manifest_app_hash_resource[k].nil?
             end
           end
diff --git a/app/controllers/base/model_controller.rb b/app/controllers/base/model_controller.rb
index 78c1d80048f..5acc49dc561 100644
--- a/app/controllers/base/model_controller.rb
+++ b/app/controllers/base/model_controller.rb
@@ -237,7 +237,7 @@ def do_related(verb, guid, name, other_guid, parent_model=model)
     #
     # @param [Roles] The roles for the current user or client.
     def validate_access(operation, obj, *)
-      if @access_context.cannot?("#{operation}_with_token".to_sym, obj)
+      if @access_context.cannot?(:"#{operation}_with_token", obj)
         obj = obj.to_s if obj.is_a? Class
         logger.info('allowy.access-denied.insufficient-scope', op: "#{operation}_with_token", obj: obj, user: user, roles: roles)
         raise CloudController::Errors::ApiError.new_from_details('InsufficientScope')
diff --git a/app/controllers/internal/syslog_drain_urls_controller.rb b/app/controllers/internal/syslog_drain_urls_controller.rb
index 8a385f8a8da..00e70a5944c 100644
--- a/app/controllers/internal/syslog_drain_urls_controller.rb
+++ b/app/controllers/internal/syslog_drain_urls_controller.rb
@@ -14,18 +14,18 @@ def list
                            where(Sequel.lit('syslog_drain_url IS NOT NULL')).
                            where(Sequel.lit("syslog_drain_url != ''")).
                            group(
-                             "#{AppModel.table_name}__guid".to_sym,
-                             "#{AppModel.table_name}__name".to_sym,
-                             "#{Space.table_name}__name".to_sym,
-                             "#{Organization.table_name}__name".to_sym
+                             :"#{AppModel.table_name}__guid",
+                             :"#{AppModel.table_name}__name",
+                             :"#{Space.table_name}__name",
+                             :"#{Organization.table_name}__name"
                            ).
                            select(
-                             "#{AppModel.table_name}__guid".to_sym,
-                             "#{AppModel.table_name}__name".to_sym,
-                             aggregate_function("#{ServiceBinding.table_name}__syslog_drain_url".to_sym).as(:syslog_drain_urls)
+                             :"#{AppModel.table_name}__guid",
+                             :"#{AppModel.table_name}__name",
+                             aggregate_function(:"#{ServiceBinding.table_name}__syslog_drain_url").as(:syslog_drain_urls)
                            ).
-                           select_append("#{Space.table_name}__name___space_name".to_sym).
-                           select_append("#{Organization.table_name}__name___organization_name".to_sym).
+                           select_append(:"#{Space.table_name}__name___space_name").
+                           select_append(:"#{Organization.table_name}__name___organization_name").
                            order(:guid).
                            limit(batch_size).
                            offset(last_id).
diff --git a/app/controllers/runtime/organizations_controller.rb b/app/controllers/runtime/organizations_controller.rb
index 768d73b2790..47b3e060c7e 100644
--- a/app/controllers/runtime/organizations_controller.rb
+++ b/app/controllers/runtime/organizations_controller.rb
@@ -182,8 +182,8 @@ def get_memory_usage(guid)
     VCAP::CloudController::Roles::ORG_ROLE_NAMES.each do |role|
       plural_role = role.to_s.pluralize
 
-      put "/v2/organizations/:guid/#{plural_role}/:user_id", "add_#{role}_by_user_id".to_sym
-      put "/v2/organizations/:guid/#{plural_role}", "add_#{role}_by_username".to_sym
+      put "/v2/organizations/:guid/#{plural_role}/:user_id", :"add_#{role}_by_user_id"
+      put "/v2/organizations/:guid/#{plural_role}", :"add_#{role}_by_username"
 
       define_method("add_#{role}_by_username") do |guid|
         FeatureFlag.raise_unless_enabled!(:set_roles_by_username)
@@ -213,10 +213,10 @@ def get_memory_usage(guid)
     VCAP::CloudController::Roles::ORG_ROLE_NAMES.each do |role|
       plural_role = role.to_s.pluralize
 
-      delete "/v2/organizations/:guid/#{plural_role}/:user_id", "remove_#{role}_by_user_id".to_sym
-      delete "/v2/organizations/:guid/#{plural_role}", "remove_#{role}_by_username".to_sym
+      delete "/v2/organizations/:guid/#{plural_role}/:user_id", :"remove_#{role}_by_user_id"
+      delete "/v2/organizations/:guid/#{plural_role}", :"remove_#{role}_by_username"
 
-      post "/v2/organizations/:guid/#{plural_role}/remove", "remove_#{role}_by_username".to_sym
+      post "/v2/organizations/:guid/#{plural_role}/remove", :"remove_#{role}_by_username"
 
       define_method("remove_#{role}_by_username") do |guid|
         FeatureFlag.raise_unless_enabled!(:unset_roles_by_username)
@@ -340,7 +340,7 @@ def add_role(guid, role, user_id, username)
     end
 
     def remove_role(guid, role, user_id)
-      response = remove_related(guid, "#{role}s".to_sym, user_id, Organization)
+      response = remove_related(guid, :"#{role}s", user_id, Organization)
 
       user = User.first(guid: user_id)
       user.username = '' unless user.username
diff --git a/app/controllers/runtime/route_mappings_controller.rb b/app/controllers/runtime/route_mappings_controller.rb
index ead0bd56016..0aee4db0edb 100644
--- a/app/controllers/runtime/route_mappings_controller.rb
+++ b/app/controllers/runtime/route_mappings_controller.rb
@@ -82,7 +82,7 @@ def get_filtered_dataset_for_enumeration(model, dataset, query_params, opts)
     define_routes
 
     def filter_dataset(dataset)
-      dataset.where("#{RouteMappingModel.table_name}__process_type".to_sym => ProcessTypes::WEB)
+      dataset.where("#{RouteMappingModel.table_name}__process_type": ProcessTypes::WEB)
     end
 
     def get_app_port(process_guid, app_port)
diff --git a/app/controllers/runtime/spaces_controller.rb b/app/controllers/runtime/spaces_controller.rb
index 894bba2ca45..d063b08ffb1 100644
--- a/app/controllers/runtime/spaces_controller.rb
+++ b/app/controllers/runtime/spaces_controller.rb
@@ -186,8 +186,8 @@ def delete(guid)
     VCAP::CloudController::Roles::SPACE_ROLE_NAMES.each do |role|
       plural_role = role.to_s.pluralize
 
-      put "/v2/spaces/:guid/#{plural_role}/:user_id", "add_#{role}_by_user_id".to_sym
-      put "/v2/spaces/:guid/#{plural_role}", "add_#{role}_by_username".to_sym
+      put "/v2/spaces/:guid/#{plural_role}/:user_id", :"add_#{role}_by_user_id"
+      put "/v2/spaces/:guid/#{plural_role}", :"add_#{role}_by_username"
 
       define_method("add_#{role}_by_username") do |guid|
         FeatureFlag.raise_unless_enabled!(:set_roles_by_username)
@@ -217,10 +217,10 @@ def delete(guid)
     VCAP::CloudController::Roles::SPACE_ROLE_NAMES.each do |role|
       plural_role = role.to_s.pluralize
 
-      delete "/v2/spaces/:guid/#{plural_role}/:user_id", "remove_#{role}_by_user_id".to_sym
-      delete "/v2/spaces/:guid/#{plural_role}", "remove_#{role}_by_username".to_sym
+      delete "/v2/spaces/:guid/#{plural_role}/:user_id", :"remove_#{role}_by_user_id"
+      delete "/v2/spaces/:guid/#{plural_role}", :"remove_#{role}_by_username"
 
-      post "/v2/spaces/:guid/#{plural_role}/remove", "remove_#{role}_by_username".to_sym
+      post "/v2/spaces/:guid/#{plural_role}/remove", :"remove_#{role}_by_username"
 
       define_method("remove_#{role}_by_username") do |guid|
         FeatureFlag.raise_unless_enabled!(:unset_roles_by_username)
diff --git a/app/controllers/v3/service_instances_controller.rb b/app/controllers/v3/service_instances_controller.rb
index 26f792f88f3..bf54de7d644 100644
--- a/app/controllers/v3/service_instances_controller.rb
+++ b/app/controllers/v3/service_instances_controller.rb
@@ -201,7 +201,7 @@ def credentials
 
     service_event_repository.record_user_provided_service_instance_event(:show, service_instance)
 
-    render status: :ok, json: (service_instance.credentials || {})
+    render status: :ok, json: service_instance.credentials || {}
   end
 
   def parameters
diff --git a/app/fetchers/isolation_segment_list_fetcher.rb b/app/fetchers/isolation_segment_list_fetcher.rb
index 91a798d492f..a22f687d57b 100644
--- a/app/fetchers/isolation_segment_list_fetcher.rb
+++ b/app/fetchers/isolation_segment_list_fetcher.rb
@@ -16,9 +16,9 @@ def fetch_for_organizations(message, org_guids_query:)
       private
 
       def filter(message, dataset)
-        dataset = dataset.where("#{IsolationSegmentModel.table_name}__guid".to_sym => message.guids) if message.requested?(:guids)
+        dataset = dataset.where("#{IsolationSegmentModel.table_name}__guid": message.guids) if message.requested?(:guids)
 
-        dataset = dataset.where("#{IsolationSegmentModel.table_name}__name".to_sym => message.names) if message.requested?(:names)
+        dataset = dataset.where("#{IsolationSegmentModel.table_name}__name": message.names) if message.requested?(:names)
 
         if message.requested?(:organization_guids)
           dataset = dataset.join(:organizations_isolation_segments, {
diff --git a/app/fetchers/package_list_fetcher.rb b/app/fetchers/package_list_fetcher.rb
index be2e36dae00..531e4adf70c 100644
--- a/app/fetchers/package_list_fetcher.rb
+++ b/app/fetchers/package_list_fetcher.rb
@@ -26,7 +26,7 @@ def fetch_for_app(message:)
       private
 
       def table_column_name(table_class, name)
-        "#{table_class.table_name}__#{name}".to_sym
+        :"#{table_class.table_name}__#{name}"
       end
 
       def joined_dataset
diff --git a/app/messages/base_message.rb b/app/messages/base_message.rb
index 1d5366eecfe..60540218cfe 100644
--- a/app/messages/base_message.rb
+++ b/app/messages/base_message.rb
@@ -51,7 +51,7 @@ def to_param_hash(exclude: [], fields: [])
 
         if fields.include?(key)
           val.each do |resource, selectors|
-            params["#{key}[#{resource}]".to_sym] = selectors.join(',')
+            params[:"#{key}[#{resource}]"] = selectors.join(',')
           end
         else
           params[key] = val.is_a?(Array) ? val.map { |v| v.gsub(',', CGI.escape(',')) }.join(',') : val
diff --git a/app/messages/route_update_destinations_message.rb b/app/messages/route_update_destinations_message.rb
index 2a8b9cbe5de..17918ac80ae 100644
--- a/app/messages/route_update_destinations_message.rb
+++ b/app/messages/route_update_destinations_message.rb
@@ -74,7 +74,7 @@ def validate_destination_contents
         app_to_ports_hash[dst[:app]] << dst[:port]
       end
 
-      app_to_ports_hash.each do |_, port_array|
+      app_to_ports_hash.each_value do |port_array|
         if port_array.length > 10
           errors.add(:process, 'must have at most 10 exposed ports.')
           break
diff --git a/app/messages/validators.rb b/app/messages/validators.rb
index 870a7749954..818e0a47657 100644
--- a/app/messages/validators.rb
+++ b/app/messages/validators.rb
@@ -300,11 +300,11 @@ def validate_guids(record, attribute, value)
     end
 
     def properly_formatted_data(data)
-      (data.is_a?(Array) && data.all? { |hsh| is_a_guid_hash?(hsh) })
+      data.is_a?(Array) && data.all? { |hsh| is_a_guid_hash?(hsh) }
     end
 
     def has_correct_structure?(value)
-      (value.is_a?(Hash) && value[:data] && properly_formatted_data(value[:data]))
+      value.is_a?(Hash) && value[:data] && properly_formatted_data(value[:data])
     end
 
     def is_a_guid_hash?(hsh)
diff --git a/app/models/runtime/constraints/base_health_check_policy.rb b/app/models/runtime/constraints/base_health_check_policy.rb
index 62b33a87bdf..f1f46de497d 100644
--- a/app/models/runtime/constraints/base_health_check_policy.rb
+++ b/app/models/runtime/constraints/base_health_check_policy.rb
@@ -74,7 +74,7 @@ def is_health_check_type_port
   end
 
   def validate_health_check_http_endpoint
-    if @health_check_type == VCAP::CloudController::HealthCheckTypes::HTTP && \
+    if @health_check_type == VCAP::CloudController::HealthCheckTypes::HTTP &&
        !UriUtils.is_uri_path?(@health_check_http_endpoint)
       @errors.add(@var_presenter['endpoint'][:sym], http_endpoint_invalid_message)
     end
diff --git a/app/models/runtime/process_model.rb b/app/models/runtime/process_model.rb
index 76f2211d54b..9c9f32ef7c5 100644
--- a/app/models/runtime/process_model.rb
+++ b/app/models/runtime/process_model.rb
@@ -92,7 +92,7 @@ def staged
       end
 
       def runnable
-        staged.where("#{ProcessModel.table_name}__state".to_sym => STARTED).where { instances > 0 }
+        staged.where("#{ProcessModel.table_name}__state": STARTED).where { instances > 0 }
       end
 
       def diego
@@ -466,7 +466,7 @@ def self.user_visibility_filter(user)
                     union(Space.join(:organizations_managers, organization_id: :organization_id, user_id: user.id).select(:spaces__guid)).select(:guid)
 
       {
-        "#{ProcessModel.table_name}__app_guid".to_sym => AppModel.where(space: space_guids.all).select(:guid)
+        "#{ProcessModel.table_name}__app_guid": AppModel.where(space: space_guids.all).select(:guid)
       }
     end
 
@@ -598,8 +598,8 @@ def app_usage_changed?
     end
 
     def footprint_changed?
-      (column_changed?(:production) || column_changed?(:memory) ||
-        column_changed?(:instances))
+      column_changed?(:production) || column_changed?(:memory) ||
+        column_changed?(:instances)
     end
 
     class << self
diff --git a/app/models/runtime/space.rb b/app/models/runtime/space.rb
index 8478ae4fa78..7a3e7ef53a7 100644
--- a/app/models/runtime/space.rb
+++ b/app/models/runtime/space.rb
@@ -14,7 +14,7 @@ class DBNameUniqueRaceError < Sequel::ValidationFailed; end
     SPACE_NAME_REGEX = /\A[[:alnum:][:punct:][:print:]]+\Z/
     SELECT_NEWEST_PROCESS = lambda { |_, processes|
       newest_processes = {}
-      processes.group_by(&:app_guid).each do |_, processes_for_app|
+      processes.group_by(&:app_guid).each_value do |processes_for_app|
         newest_process = processes_for_app.max_by { |p| [p.created_at, p.id] }
         newest_processes[newest_process.guid] = newest_process
       end
diff --git a/app/models/services/service_plan.rb b/app/models/services/service_plan.rb
index daa918bb8a3..f713352828b 100644
--- a/app/models/services/service_plan.rb
+++ b/app/models/services/service_plan.rb
@@ -5,9 +5,9 @@ class ServicePlan < Sequel::Model
     many_to_one :service
     one_to_many :service_instances
 
-    one_to_many :service_plan_visibilities, clearer: (lambda do
+    one_to_many :service_plan_visibilities, clearer: lambda {
       service_plan_visibilities_dataset.delete
-    end)
+    }
 
     add_association_dependencies service_plan_visibilities: :destroy
 
diff --git a/app/models/services/user_provided_service_instance.rb b/app/models/services/user_provided_service_instance.rb
index 4faaba679f4..7a9e8bc1321 100644
--- a/app/models/services/user_provided_service_instance.rb
+++ b/app/models/services/user_provided_service_instance.rb
@@ -44,7 +44,7 @@ def not_https?
     end
 
     def not_valid_host?
-      (!URI(route_service_url).host || URI(route_service_url).host.to_s[0] == '.')
+      !URI(route_service_url).host || URI(route_service_url).host.to_s[0] == '.'
     end
   end
 end
diff --git a/app/repositories/app_usage_event_repository.rb b/app/repositories/app_usage_event_repository.rb
index 5e3761c35dd..d71e7a0c0ed 100644
--- a/app/repositories/app_usage_event_repository.rb
+++ b/app/repositories/app_usage_event_repository.rb
@@ -88,10 +88,10 @@ def purge_and_reseed_started_apps!
 
         column_map = {
           app_name: :parent_app__name,
-          guid: "#{ProcessModel.table_name}__guid".to_sym,
-          app_guid: "#{ProcessModel.table_name}__guid".to_sym,
-          state: "#{ProcessModel.table_name}__state".to_sym,
-          previous_state: "#{ProcessModel.table_name}__state".to_sym,
+          guid: :"#{ProcessModel.table_name}__guid",
+          app_guid: :"#{ProcessModel.table_name}__guid",
+          state: :"#{ProcessModel.table_name}__state",
+          previous_state: :"#{ProcessModel.table_name}__state",
           package_state: Sequel.case(
             [
               [{ latest_droplet__state: DropletModel::FAILED_STATE }, 'FAILED'],
@@ -101,15 +101,15 @@ def purge_and_reseed_started_apps!
             'PENDING'
           ),
           previous_package_state: 'UNKNOWN',
-          instance_count: "#{ProcessModel.table_name}__instances".to_sym,
-          previous_instance_count: "#{ProcessModel.table_name}__instances".to_sym,
-          memory_in_mb_per_instance: "#{ProcessModel.table_name}__memory".to_sym,
-          previous_memory_in_mb_per_instance: "#{ProcessModel.table_name}__memory".to_sym,
+          instance_count: :"#{ProcessModel.table_name}__instances",
+          previous_instance_count: :"#{ProcessModel.table_name}__instances",
+          memory_in_mb_per_instance: :"#{ProcessModel.table_name}__memory",
+          previous_memory_in_mb_per_instance: :"#{ProcessModel.table_name}__memory",
           buildpack_guid: :desired_droplet__buildpack_receipt_buildpack_guid,
           buildpack_name: :desired_droplet__buildpack_receipt_buildpack,
-          space_guid: "#{Space.table_name}__guid".to_sym,
-          space_name: "#{Space.table_name}__name".to_sym,
-          org_guid: "#{Organization.table_name}__guid".to_sym,
+          space_guid: :"#{Space.table_name}__guid",
+          space_name: :"#{Space.table_name}__name",
+          org_guid: :"#{Organization.table_name}__guid",
           created_at: Sequel.datetime_class.now,
           parent_app_name: :parent_app__name,
           parent_app_guid: :parent_app__guid
@@ -141,8 +141,8 @@ def purge_and_reseed_started_apps!
             table_alias: :latest_droplet
           ).
           select(*column_map.values).
-          where("#{ProcessModel.table_name}__state".to_sym => 'STARTED').
-          order("#{ProcessModel.table_name}__id".to_sym)
+          where("#{ProcessModel.table_name}__state": 'STARTED').
+          order(:"#{ProcessModel.table_name}__id")
 
         AppUsageEvent.insert(column_map.keys, usage_query)
       end
diff --git a/db/migrations/20130530173342_fix_permission_fk_problems.rb b/db/migrations/20130530173342_fix_permission_fk_problems.rb
index d5c5fb1fc29..3c9f2de8083 100644
--- a/db/migrations/20130530173342_fix_permission_fk_problems.rb
+++ b/db/migrations/20130530173342_fix_permission_fk_problems.rb
@@ -3,11 +3,11 @@
 # Helper method to cleanup erroneous fk columns in permission tables
 def cleanup_permission_table(name, permission)
   name = name.to_s
-  join_table = "#{name.pluralize}_#{permission}".to_sym
-  id_attr = "#{name}_id".to_sym
-  fk_name = "#{name}_fk".to_sym
-  new_fk_name = "#{join_table}_#{name}_fk".to_sym
-  new_fk_user = "#{join_table}_user_fk".to_sym
+  join_table = :"#{name.pluralize}_#{permission}"
+  id_attr = :"#{name}_id"
+  fk_name = :"#{name}_fk"
+  new_fk_name = :"#{join_table}_#{name}_fk"
+  new_fk_user = :"#{join_table}_user_fk"
   table = name.pluralize.to_sym
   # rename based on finding an fk that references one of the bad columns
   foreign_key_list(join_table).each do |fk|
diff --git a/db/migrations/20130806175100_support_30char_identifiers_for_oracle.rb b/db/migrations/20130806175100_support_30char_identifiers_for_oracle.rb
index 55e2742ab34..6016888c96d 100644
--- a/db/migrations/20130806175100_support_30char_identifiers_for_oracle.rb
+++ b/db/migrations/20130806175100_support_30char_identifiers_for_oracle.rb
@@ -45,21 +45,21 @@ def rename_index(table, columns, opts={})
 end
 
 def rename_common_indexes(table, table_key)
-  rename_index(table, :created_at, name: "#{table_key}_created_at_index".to_sym)
-  rename_index(table, :updated_at, name: "#{table_key}_updated_at_index".to_sym)
-  rename_index(table, :guid, unique: true, name: "#{table_key}_guid_index".to_sym)
+  rename_index(table, :created_at, name: :"#{table_key}_created_at_index")
+  rename_index(table, :updated_at, name: :"#{table_key}_updated_at_index")
+  rename_index(table, :guid, unique: true, name: :"#{table_key}_guid_index")
 end
 
 def rename_permission_table(name, name_short, permission)
   name = name.to_s
-  join_table = "#{name.pluralize}_#{permission}".to_sym
-  join_table_short = "#{name_short}_#{permission}".to_sym
-  id_attr = "#{name}_id".to_sym
-  idx_name = "#{name_short}_#{permission}_idx".to_sym
-  fk_name = "#{join_table}_#{name}_fk".to_sym
-  fk_user = "#{join_table}_user_fk".to_sym
-  fk_name_short = "#{join_table_short}_#{name_short}_fk".to_sym
-  fk_user_short = "#{join_table_short}_user_fk".to_sym
+  join_table = :"#{name.pluralize}_#{permission}"
+  join_table_short = :"#{name_short}_#{permission}"
+  id_attr = :"#{name}_id"
+  idx_name = :"#{name_short}_#{permission}_idx"
+  fk_name = :"#{join_table}_#{name}_fk"
+  fk_user = :"#{join_table}_user_fk"
+  fk_name_short = :"#{join_table_short}_#{name_short}_fk"
+  fk_user_short = :"#{join_table_short}_user_fk"
 
   rename_foreign_key(join_table, fk_name, fk_name_short) do |db, alter_table|
     rename_foreign_key_internal(db, alter_table, join_table, fk_user, fk_user_short) do |db, alter_table|
diff --git a/db/migrations/20230822173000_add_migration_views_for_annotations.rb b/db/migrations/20230822173000_add_migration_views_for_annotations.rb
index 629e33d9963..225e92a2dcf 100644
--- a/db/migrations/20230822173000_add_migration_views_for_annotations.rb
+++ b/db/migrations/20230822173000_add_migration_views_for_annotations.rb
@@ -32,14 +32,14 @@
   up do
     annotation_tables.each do |table|
       transaction do
-        create_view("#{table}_migration_view".to_sym, self[table.to_sym].select { [id, guid, created_at, updated_at, resource_guid, key_prefix, key.as(key_name), value] })
+        create_view(:"#{table}_migration_view", self[table.to_sym].select { [id, guid, created_at, updated_at, resource_guid, key_prefix, key.as(key_name), value] })
       end
     end
   end
   down do
     annotation_tables.each do |table|
       transaction do
-        drop_view("#{table}_migration_view".to_sym, if_exists: true)
+        drop_view(:"#{table}_migration_view", if_exists: true)
       end
     end
   end
diff --git a/lib/cloud_controller/backends/runners.rb b/lib/cloud_controller/backends/runners.rb
index f322068d9b8..290d8ab6f14 100644
--- a/lib/cloud_controller/backends/runners.rb
+++ b/lib/cloud_controller/backends/runners.rb
@@ -20,7 +20,7 @@ def diego_processes(batch_size, last_id)
         diego.
         runnable.
         where(Sequel.lit("#{ProcessModel.table_name}.id > ?", last_id)).
-        order("#{ProcessModel.table_name}__id".to_sym).
+        order(:"#{ProcessModel.table_name}__id").
         limit(batch_size).
         eager(:desired_droplet, :space, :service_bindings, { routes: :domain }, { app: :buildpack_lifecycle_data }).
         all
@@ -31,8 +31,8 @@ def processes_from_diego_process_guids(diego_process_guids)
       ProcessModel.select_all(ProcessModel.table_name).
         diego.
         runnable.
-        where("#{ProcessModel.table_name}__guid".to_sym => diego_process_guids.map { |pg| Diego::ProcessGuid.cc_process_guid(pg) }).
-        order("#{ProcessModel.table_name}__id".to_sym).
+        where("#{ProcessModel.table_name}__guid": diego_process_guids.map { |pg| Diego::ProcessGuid.cc_process_guid(pg) }).
+        order(:"#{ProcessModel.table_name}__id").
         eager(:desired_droplet, :space, :service_bindings, { routes: :domain }, { app: :buildpack_lifecycle_data }).
         all.
         select { |process| diego_process_guids.include?(Diego::ProcessGuid.from_process(process)) }
@@ -43,16 +43,16 @@ def diego_apps_cache_data(batch_size, last_id)
                    diego.
                    runnable.
                    where(Sequel.lit("#{ProcessModel.table_name}.id > ?", last_id)).
-                   order("#{ProcessModel.table_name}__id".to_sym).
+                   order(:"#{ProcessModel.table_name}__id").
                    limit(batch_size)
 
       diego_apps = diego_apps.buildpack_type unless FeatureFlag.enabled?(:diego_docker)
 
       diego_apps.select_map([
-        "#{ProcessModel.table_name}__id".to_sym,
-        "#{ProcessModel.table_name}__guid".to_sym,
-        "#{ProcessModel.table_name}__version".to_sym,
-        "#{ProcessModel.table_name}__updated_at".to_sym
+        :"#{ProcessModel.table_name}__id",
+        :"#{ProcessModel.table_name}__guid",
+        :"#{ProcessModel.table_name}__version",
+        :"#{ProcessModel.table_name}__updated_at"
       ])
     end
 
diff --git a/lib/cloud_controller/basic_auth/basic_auth_authenticator.rb b/lib/cloud_controller/basic_auth/basic_auth_authenticator.rb
index c00e11a11a0..b9705b4982c 100644
--- a/lib/cloud_controller/basic_auth/basic_auth_authenticator.rb
+++ b/lib/cloud_controller/basic_auth/basic_auth_authenticator.rb
@@ -3,7 +3,7 @@ module BasicAuth
     class BasicAuthAuthenticator
       def self.valid?(rack_env, credentials)
         auth = Rack::Auth::Basic::Request.new(rack_env)
-        auth.provided? && auth.basic? && \
+        auth.provided? && auth.basic? &&
           auth.credentials == credentials.map { |encoded_cred| CGI.unescape(encoded_cred) }
       end
     end
diff --git a/lib/cloud_controller/db.rb b/lib/cloud_controller/db.rb
index cf447359e3e..02955eefb79 100644
--- a/lib/cloud_controller/db.rb
+++ b/lib/cloud_controller/db.rb
@@ -149,8 +149,8 @@ def empty_from_sql
 module VCAP
   module Migration
     def self.timestamps(migration, table_key)
-      created_at_idx = "#{table_key}_created_at_index".to_sym if table_key
-      updated_at_idx = "#{table_key}_updated_at_index".to_sym if table_key
+      created_at_idx = :"#{table_key}_created_at_index" if table_key
+      updated_at_idx = :"#{table_key}_updated_at_index" if table_key
       migration.Timestamp :created_at, null: false, default: Sequel::CURRENT_TIMESTAMP
       migration.Timestamp :updated_at
       migration.index :created_at, name: created_at_idx
@@ -158,7 +158,7 @@ def self.timestamps(migration, table_key)
     end
 
     def self.guid(migration, table_key)
-      guid_idx = "#{table_key}_guid_index".to_sym if table_key
+      guid_idx = :"#{table_key}_guid_index" if table_key
       migration.String :guid, null: false
       migration.index :guid, unique: true, name: guid_idx
     end
@@ -175,9 +175,9 @@ def self.labels_common(migration, table_key, foreign_resource_table_key)
       migration.String :key_name, size: 63
       migration.String :value, size: 63
 
-      migration.foreign_key [:resource_guid], foreign_resource_table_key, key: :guid, name: "fk_#{table_key}_resource_guid".to_sym
-      migration.index [:resource_guid], name: "fk_#{table_key}_resource_guid_index".to_sym
-      migration.index %i[key_prefix key_name value], name: "#{table_key}_compound_index".to_sym
+      migration.foreign_key [:resource_guid], foreign_resource_table_key, key: :guid, name: :"fk_#{table_key}_resource_guid"
+      migration.index [:resource_guid], name: :"fk_#{table_key}_resource_guid_index"
+      migration.index %i[key_prefix key_name value], name: :"#{table_key}_compound_index"
     end
 
     def self.annotations_common(migration, table_key, foreign_resource_table_key)
@@ -186,18 +186,18 @@ def self.annotations_common(migration, table_key, foreign_resource_table_key)
       migration.String :key, size: 1000
       migration.String :value, size: 5000
 
-      migration.foreign_key [:resource_guid], foreign_resource_table_key, key: :guid, name: "fk_#{table_key}_resource_guid".to_sym
-      migration.index [:resource_guid], name: "fk_#{table_key}_resource_guid_index".to_sym
+      migration.foreign_key [:resource_guid], foreign_resource_table_key, key: :guid, name: :"fk_#{table_key}_resource_guid"
+      migration.index [:resource_guid], name: :"fk_#{table_key}_resource_guid_index"
     end
 
     def self.create_permission_table(migration, name, name_short, permission)
       name = name.to_s
-      join_table = "#{name.pluralize}_#{permission}".to_sym
-      join_table_short = "#{name_short}_#{permission}".to_sym
-      id_attr = "#{name}_id".to_sym
-      idx_name = "#{name_short}_#{permission}_idx".to_sym
-      fk_name = "#{join_table_short}_#{name_short}_fk".to_sym
-      fk_user = "#{join_table_short}_user_fk".to_sym
+      join_table = :"#{name.pluralize}_#{permission}"
+      join_table_short = :"#{name_short}_#{permission}"
+      id_attr = :"#{name}_id"
+      idx_name = :"#{name_short}_#{permission}_idx"
+      fk_name = :"#{join_table_short}_#{name_short}_fk"
+      fk_user = :"#{join_table_short}_user_fk"
       table = name.pluralize.to_sym
 
       migration.create_table(join_table) do
diff --git a/lib/cloud_controller/diego/buildpack/desired_lrp_builder.rb b/lib/cloud_controller/diego/buildpack/desired_lrp_builder.rb
index ff51f56a95b..8692a44faf7 100644
--- a/lib/cloud_controller/diego/buildpack/desired_lrp_builder.rb
+++ b/lib/cloud_controller/diego/buildpack/desired_lrp_builder.rb
@@ -22,7 +22,7 @@ def initialize(config, opts)
         def cached_dependencies
           return nil if @config.get(:diego, :enable_declarative_asset_downloads)
 
-          lifecycle_bundle_key = "buildpack/#{@stack}".to_sym
+          lifecycle_bundle_key = :"buildpack/#{@stack}"
           lifecycle_bundle = @config.get(:diego, :lifecycle_bundles)[lifecycle_bundle_key]
           raise InvalidStack.new("no compiler defined for requested stack '#{@stack}'") unless lifecycle_bundle
 
@@ -61,7 +61,7 @@ def setup
         def image_layers
           return [] unless @config.get(:diego, :enable_declarative_asset_downloads)
 
-          lifecycle_bundle_key = "buildpack/#{@stack}".to_sym
+          lifecycle_bundle_key = :"buildpack/#{@stack}"
           lifecycle_bundle = @config.get(:diego, :lifecycle_bundles)[lifecycle_bundle_key]
           raise InvalidStack.new("no compiler defined for requested stack '#{@stack}'") unless lifecycle_bundle
 
diff --git a/lib/cloud_controller/diego/buildpack/staging_action_builder.rb b/lib/cloud_controller/diego/buildpack/staging_action_builder.rb
index ec24ac31889..65440d8e837 100644
--- a/lib/cloud_controller/diego/buildpack/staging_action_builder.rb
+++ b/lib/cloud_controller/diego/buildpack/staging_action_builder.rb
@@ -212,7 +212,7 @@ def skip_detect?
         end
 
         def lifecycle_bundle_key
-          "buildpack/#{lifecycle_data[:stack]}".to_sym
+          :"buildpack/#{lifecycle_data[:stack]}"
         end
 
         def upload_buildpack_artifacts_cache_uri
diff --git a/lib/cloud_controller/diego/buildpack/task_action_builder.rb b/lib/cloud_controller/diego/buildpack/task_action_builder.rb
index 4cd07320225..2e2b58b8215 100644
--- a/lib/cloud_controller/diego/buildpack/task_action_builder.rb
+++ b/lib/cloud_controller/diego/buildpack/task_action_builder.rb
@@ -104,7 +104,7 @@ def cached_dependencies
         end
 
         def lifecycle_bundle_key
-          "buildpack/#{lifecycle_stack}".to_sym
+          :"buildpack/#{lifecycle_stack}"
         end
 
         private
diff --git a/lib/cloud_controller/diego/processes_sync.rb b/lib/cloud_controller/diego/processes_sync.rb
index 6393dc11310..fa358128438 100644
--- a/lib/cloud_controller/diego/processes_sync.rb
+++ b/lib/cloud_controller/diego/processes_sync.rb
@@ -160,11 +160,11 @@ def processes_for_sync(last_id)
                     diego.
                     runnable.
                     where(Sequel.lit("#{ProcessModel.table_name}.id > ?", last_id)).
-                    order("#{ProcessModel.table_name}__id".to_sym).
+                    order(:"#{ProcessModel.table_name}__id").
                     limit(BATCH_SIZE)
 
-        processes.select("#{ProcessModel.table_name}__id".to_sym, "#{ProcessModel.table_name}__guid".to_sym, "#{ProcessModel.table_name}__version".to_sym,
-                         "#{ProcessModel.table_name}__updated_at".to_sym)
+        processes.select(:"#{ProcessModel.table_name}__id", :"#{ProcessModel.table_name}__guid", :"#{ProcessModel.table_name}__version",
+                         :"#{ProcessModel.table_name}__updated_at")
       end
 
       def bbs_apps_client
diff --git a/lib/cloud_controller/errands/rotate_database_key.rb b/lib/cloud_controller/errands/rotate_database_key.rb
index fa544c562de..126a3655d1f 100644
--- a/lib/cloud_controller/errands/rotate_database_key.rb
+++ b/lib/cloud_controller/errands/rotate_database_key.rb
@@ -71,7 +71,7 @@ def encrypt_row(encrypted_fields, row)
 
       def encrypt_field(field, row)
         field_name = field[:field_name]
-        row.public_send("#{field_name}=".to_sym, row.public_send(field_name.to_sym))
+        row.public_send(:"#{field_name}=", row.public_send(field_name.to_sym))
       end
     end
   end
diff --git a/lib/cloud_controller/rest_controller/secure_eager_loader.rb b/lib/cloud_controller/rest_controller/secure_eager_loader.rb
index c957be3bcd8..2d35d58cb4c 100644
--- a/lib/cloud_controller/rest_controller/secure_eager_loader.rb
+++ b/lib/cloud_controller/rest_controller/secure_eager_loader.rb
@@ -38,7 +38,7 @@ def build_eager_load_hash(controller_class, model_class, default_visibility_filt
           # Since we are using STI in some models (e.g. Domain, ServiceInstance)
           # we are not able to find association on the parent class defined on a child class.
           # We are assuming that parent will have an association with a suffix.
-          association_name = "#{association_name}_sti_eager_load".to_sym
+          association_name = :"#{association_name}_sti_eager_load"
           association_model_class = model_class.association_reflection(association_name)
         end
 
diff --git a/lib/services/service_brokers/v2/client.rb b/lib/services/service_brokers/v2/client.rb
index 193dc974f51..d22433686ae 100644
--- a/lib/services/service_brokers/v2/client.rb
+++ b/lib/services/service_brokers/v2/client.rb
@@ -411,7 +411,7 @@ def service_instance_resource_path(instance, opts={})
 
     def hashified_public_annotations(annotations)
       public_annotations = []
-      annotations.each do |annotation, _|
+      annotations.each do |annotation|
         prefix, = VCAP::CloudController::MetadataHelpers.extract_prefix(annotation.key_name)
         public_annotations.append(annotation) if annotation.key_prefix.present? || prefix.present?
       end
diff --git a/spec/request/organizations_spec.rb b/spec/request/organizations_spec.rb
index 55aac49322e..c7f3dae1a24 100644
--- a/spec/request/organizations_spec.rb
+++ b/spec/request/organizations_spec.rb
@@ -1705,7 +1705,7 @@ def build_user_json(guid, username, origin)
       created_at: iso8601,
       updated_at: iso8601,
       username: username,
-      presentation_name: (username.presence || guid),
+      presentation_name: username.presence || guid,
       origin: origin,
       metadata: {
         labels: {},
diff --git a/spec/support/legacy_api_dsl.rb b/spec/support/legacy_api_dsl.rb
index 1ec2639c137..5cfa07f26de 100644
--- a/spec/support/legacy_api_dsl.rb
+++ b/spec/support/legacy_api_dsl.rb
@@ -53,7 +53,7 @@ def parsed_response
   def field_is_url_and_relationship_not_present?(json, field)
     return unless field =~ /(.*)_url$/
 
-    !json["#{Regexp.last_match[1]}_guid".to_sym]
+    !json[:"#{Regexp.last_match[1]}_guid"]
   end
 
   def audited_event(event)
diff --git a/spec/support/matchers/allow_op_on_object.rb b/spec/support/matchers/allow_op_on_object.rb
index e2cf6fe27a4..bc68b63f92b 100644
--- a/spec/support/matchers/allow_op_on_object.rb
+++ b/spec/support/matchers/allow_op_on_object.rb
@@ -1,6 +1,6 @@
 RSpec::Matchers.define :allow_op_on_object do |op, object|
   match do |access|
-    access.can?("#{op}_with_token".to_sym, object) && access.can?(op, object)
+    access.can?(:"#{op}_with_token", object) && access.can?(op, object)
   end
 
   failure_message do
diff --git a/spec/support/shared_examples/access/access_spec_helper.rb b/spec/support/shared_examples/access/access_spec_helper.rb
index 7cef8afb2a7..ed3bdfb5df1 100644
--- a/spec/support/shared_examples/access/access_spec_helper.rb
+++ b/spec/support/shared_examples/access/access_spec_helper.rb
@@ -53,7 +53,7 @@
         actual_with_token = false
         actual_without_token = false
         begin
-          actual_with_token = subject.can?("#{operation}_with_token".to_sym, object)
+          actual_with_token = subject.can?(:"#{operation}_with_token", object)
 
           actual_without_token = if respond_to?(:op_params)
                                    subject.can?(operation, object, op_params)
diff --git a/spec/support/test_models.rb b/spec/support/test_models.rb
index 5c6f02d7a29..6842a1fc16c 100644
--- a/spec/support/test_models.rb
+++ b/spec/support/test_models.rb
@@ -42,7 +42,7 @@ def create?(_object, _params=nil)
     def read?(object)
       return @ok_read if instance_variable_defined?(:@ok_read)
 
-      @ok_read = (admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user))
+      @ok_read = admin_user? || admin_read_only_user? || global_auditor? || object_is_visible_to_user?(object, context.user)
     end
 
     def read_for_update?(_object, _params=nil)
diff --git a/spec/unit/lib/cloud_controller/paging/sequel_paginator_spec.rb b/spec/unit/lib/cloud_controller/paging/sequel_paginator_spec.rb
index c57e9c2ba71..034be55cc9c 100644
--- a/spec/unit/lib/cloud_controller/paging/sequel_paginator_spec.rb
+++ b/spec/unit/lib/cloud_controller/paging/sequel_paginator_spec.rb
@@ -62,7 +62,7 @@ module VCAP::CloudController
         PackageModel.make(app: app_model1)
         options = { page:, per_page: }
         pagination_options = PaginationOptions.new(options)
-        new_dataset = dataset.join(PackageModel.table_name, "#{PackageModel.table_name}__app_guid".to_sym => "#{AppModel.table_name}__guid".to_sym)
+        new_dataset = dataset.join(PackageModel.table_name, "#{PackageModel.table_name}__app_guid": :"#{AppModel.table_name}__guid")
 
         paginated_result = nil
         expect do
diff --git a/spec/unit/lib/sequel_plugins/vcap_relations_spec.rb b/spec/unit/lib/sequel_plugins/vcap_relations_spec.rb
index d12aa0454ce..18f7d10e892 100644
--- a/spec/unit/lib/sequel_plugins/vcap_relations_spec.rb
+++ b/spec/unit/lib/sequel_plugins/vcap_relations_spec.rb
@@ -9,7 +9,7 @@ def define_model(name)
     end
     self.class.send(:remove_const, name) if self.class.const_defined?(name)
     self.class.const_set(name, model_klass)
-    model_klass.set_dataset(DbConfig.new.connection["#{name.downcase}s".to_sym])
+    model_klass.set_dataset(DbConfig.new.connection[:"#{name.downcase}s"])
   end
 
   let!(:owner_klass)  { define_model(:Owner) }
diff --git a/spec/unit/lib/services/service_brokers/v2/errors/maintenance_info_conflict_spec.rb b/spec/unit/lib/services/service_brokers/v2/errors/maintenance_info_conflict_spec.rb
index 4cfcf5042de..12e3a067c5d 100644
--- a/spec/unit/lib/services/service_brokers/v2/errors/maintenance_info_conflict_spec.rb
+++ b/spec/unit/lib/services/service_brokers/v2/errors/maintenance_info_conflict_spec.rb
@@ -35,7 +35,7 @@ module Errors
             { 'description' => nil }.to_json,  # description is null
             { 'description' => true }.to_json, # description is not a String
             { 'foo' => 'bar' }.to_json,        # description is not a key in the body
-            'string'                          # body is not a hash
+            'string' # body is not a hash
           ].each do |fake_body|
             context "when the body is '#{fake_body}'" do
               let(:response_body) { fake_body }
diff --git a/spec/unit/messages/service_credential_app_binding_create_message_spec.rb b/spec/unit/messages/service_credential_app_binding_create_message_spec.rb
index 877daf5ed01..a7eeb70ea3d 100644
--- a/spec/unit/messages/service_credential_app_binding_create_message_spec.rb
+++ b/spec/unit/messages/service_credential_app_binding_create_message_spec.rb
@@ -33,7 +33,7 @@ module VCAP::CloudController
       end
 
       it 'converts requested keys to symbols' do
-        params.each do |key, _|
+        params.each_key do |key|
           expect(message).to be_requested(key.to_sym)
         end
       end
diff --git a/spec/unit/messages/service_credential_binding_create_message_spec.rb b/spec/unit/messages/service_credential_binding_create_message_spec.rb
index 7fa38660783..639a88e8f64 100644
--- a/spec/unit/messages/service_credential_binding_create_message_spec.rb
+++ b/spec/unit/messages/service_credential_binding_create_message_spec.rb
@@ -36,7 +36,7 @@ module VCAP::CloudController
       end
 
       it 'converts requested keys to symbols' do
-        params.each do |key, _|
+        params.each_key do |key|
           expect(message).to be_requested(key.to_sym)
         end
       end
diff --git a/spec/unit/messages/service_credential_binding_list_message_spec.rb b/spec/unit/messages/service_credential_binding_list_message_spec.rb
index 8fbd76e0ec3..458aaf85ff3 100644
--- a/spec/unit/messages/service_credential_binding_list_message_spec.rb
+++ b/spec/unit/messages/service_credential_binding_list_message_spec.rb
@@ -45,7 +45,7 @@ module VCAP::CloudController
       end
 
       it 'converts requested keys to symbols' do
-        params.each do |key, _|
+        params.each_key do |key|
           expect(message).to be_requested(key.to_sym)
         end
       end
diff --git a/spec/unit/messages/service_credential_key_binding_create_message_spec.rb b/spec/unit/messages/service_credential_key_binding_create_message_spec.rb
index 9e8038f7611..0fb0b74cce0 100644
--- a/spec/unit/messages/service_credential_key_binding_create_message_spec.rb
+++ b/spec/unit/messages/service_credential_key_binding_create_message_spec.rb
@@ -31,7 +31,7 @@ module VCAP::CloudController
       end
 
       it 'converts requested keys to symbols' do
-        params.each do |key, _|
+        params.each_key do |key|
           expect(message).to be_requested(key.to_sym)
         end
       end
diff --git a/spec/unit/models/services/service_binding_spec.rb b/spec/unit/models/services/service_binding_spec.rb
index 3a47ad99559..52959e54fbf 100644
--- a/spec/unit/models/services/service_binding_spec.rb
+++ b/spec/unit/models/services/service_binding_spec.rb
@@ -111,7 +111,8 @@ module VCAP::CloudController
 
         describe 'the associated app' do
           it 'allows changing to the same app' do
-            binding.app = binding.app
+            app_from_binding = binding.app
+            binding.app = app_from_binding
             expect { binding.save }.not_to raise_error
           end
 
@@ -123,7 +124,8 @@ module VCAP::CloudController
 
         describe 'the associated service instance' do
           it 'allows changing to the same service instance' do
-            binding.service_instance = binding.service_instance
+            service_instance_from_binding = binding.service_instance
+            binding.service_instance = service_instance_from_binding
             expect { binding.save }.not_to raise_error
           end