diff --git a/gems/gem_files.rb b/gems/gem_files.rb
index eda6107..1772a32 100644
--- a/gems/gem_files.rb
+++ b/gems/gem_files.rb
@@ -3,40 +3,41 @@ module Gems
     # Gems
     # require_relative 'gemfile'
     # gemfile instructions
-    gem 'pg', '~> 1.4.5'
+    gem 'pg', '~> 1.4.5' unless ARGV.include?('--skip-gem-pg')
+    gem 'tzinfo-data' unless ARGV.include?('--skip-gem-tzinfo-data')
 
     # development gems
     gem_group :development do
-      gem 'bullet', '~> 7.0.4'
-      gem 'memory_profiler'
+      gem 'bullet', '~> 7.0.4' unless ARGV.include?('--skip-gem-bullet')
+      gem 'memory_profiler' unless ARGV.include?('--skip-gem-memory_profiler')
     end
 
     # test gems
     gem_group :test do
-      gem 'rspec-sonarqube-formatter', '~> 1.5', require: false
-      gem 'shoulda-matchers', '~> 5.2.0'
+      gem 'rspec-sonarqube-formatter', '~> 1.5', require: false unless ARGV.include?('--skip-gem-rspec-sonarqube-formatter')
+      gem 'shoulda-matchers', '~> 5.2.0' unless ARGV.include?('--skip-gem-shoulda-matchers')
 
-      gem 'simplecov', require: false
-      gem 'simplecov-json'
+      gem 'simplecov', require: false unless ARGV.include?('--skip-gem-simplecov')
+      gem 'simplecov-json' unless ARGV.include?('--skip-gem-simplecov-json')
 
-      gem 'simplecov-rcov'
-      gem 'webdrivers'
+      gem 'simplecov-rcov' unless ARGV.include?('--skip-gem-simplecov-rcov')
+      gem 'webdrivers' unless ARGV.include?('--skip-gem-webdrivers')
     end
 
     # development and test gems
     gem_group :development, :test do
-      gem 'database_cleaner'
+      gem 'database_cleaner' unless ARGV.include?('--skip-gem-database_cleaner')
 
-      gem 'dotenv-rails'
-      gem 'factory_bot_rails'
+      gem 'dotenv-rails' unless ARGV.include?('--skip-gem-dotenv-rails')
+      gem 'factory_bot_rails' unless ARGV.include?('--skip-gem-factory_bot_rails')
 
-      gem 'faker', '~> 3.0.0'
+      gem 'faker', '~> 3.0.0' unless ARGV.include?('--skip-gem-faker')
 
-      gem 'reek'
-      gem 'rspec-rails', '~> 6.0.0'
-      gem 'rswag-specs', '~> 2.8.0'
-      gem 'rubocop'
-      gem 'rubocop-rails', require: false
+      gem 'reek' unless ARGV.include?('--skip-gem-reek')
+      gem 'rspec-rails', '~> 6.0.0' unless ARGV.include?('--skip-gem-rspec-rails')
+      gem 'rswag-specs', '~> 2.8.0' unless ARGV.include?('--skip-gem-rswag-specs')
+      gem 'rubocop' unless ARGV.include?('--skip-gem-rubocop')
+      gem 'rubocop-rails', require: false unless ARGV.include?('--skip-gem-rubocop-rails')
     end
   end
 end
diff --git a/template.rb b/template.rb
index b0bf75c..73652d7 100644
--- a/template.rb
+++ b/template.rb
@@ -20,6 +20,8 @@ SELF.include Docker
 SELF.include Config
 SELF.include Envs
 
+run 'bundle remove tzinfo-data'
+
 configure_gems
 spec_helper_configurations
 rails_helper_configurations