diff --git a/cekit/builder.py b/cekit/builder.py
index 39f0c5f..2b6bac3 100644
--- a/cekit/builder.py
+++ b/cekit/builder.py
@@ -80,11 +80,6 @@ class Builder(Command):
                                         self.params.target,
                                         self.params.overrides)
 
-        if self.params.get('koji_target', False):
-            LOGGER.warning("The '--koji-target' switch is deprecated, please use overrides " +
-                           "(http://docs.cekit.io/en/latest/handbook/overrides.html) to adjust the koji " +
-                           "target, '--koji-target' will be removed in version 3.6")
-
         if CONFIG.get('common', 'redhat'):
             # Add the redhat specific stuff after everything else
             self.generator.add_redhat_overrides()
diff --git a/cekit/builders/osbs.py b/cekit/builders/osbs.py
index f1513f7..defa77c 100644
--- a/cekit/builders/osbs.py
+++ b/cekit/builders/osbs.py
@@ -258,11 +258,6 @@ class OSBSBuilder(Builder):
                 # Default to computed target based on branch
                 target = "{}-containers-candidate".format(self.dist_git.branch)
 
-            # Check if it was specified on command line
-            # TODO: Remove in 3.6
-            if self.params.koji_target:
-                target = self.params.koji_target
-
             scratch = True
 
             if self.params.release:
diff --git a/cekit/cli.py b/cekit/cli.py
index ec62129..8532996 100644
--- a/cekit/cli.py
+++ b/cekit/cli.py
@@ -144,13 +144,11 @@ def build_podman(ctx, pull, no_squash, tags):  # pylint: disable=unused-argument
 @click.option('--user', metavar="USER", help="User used to kick the build as.")
 @click.option('--nowait', help="Do not wait for the task to finish.", is_flag=True)
 @click.option('--stage', help="Use stage environmen.", is_flag=True)
-# TODO: Remove in 3.6
-@click.option('--koji-target', metavar="TARGET", help="Override the default Koji target.")
 @click.option('--sync-only', help="Generate files and sync with dist-git, but do not execute build.", is_flag=True)
 @click.option('--commit-message', metavar="MESSAGE", help="Custom dist-git commit message.")
 @click.option('--assume-yes', '-y', help="Execute build in non-interactive mode.", is_flag=True)
 @click.pass_context
-def build_osbs(ctx, release, user, nowait, stage, koji_target, sync_only, commit_message, assume_yes):  # pylint: disable=unused-argument
+def build_osbs(ctx, release, user, nowait, stage, sync_only, commit_message, assume_yes):  # pylint: disable=unused-argument
     """
     DESCRIPTION
 
diff --git a/docs/handbook/building/builder-engines.rst b/docs/handbook/building/builder-engines.rst
index ad8c615..78b2a44 100644
--- a/docs/handbook/building/builder-engines.rst
+++ b/docs/handbook/building/builder-engines.rst
@@ -133,10 +133,6 @@ Parameters
         Do not wait for the task to finish
     ``--stage``
         Use stage environment
-    ``--koji-target``
-        .. deprecated:: 3.5
-
-        Overrides the default ``koji`` target
     ``--commit-message``
         Custom commit message for dist-git
     ``--sync-only``

Remove --koji-target OSBS builder switch
**Describe the solution you'd like**
The `--koji-target` switch was deprecated in 3.5. We need to remove it in 3.6.

diff --git a/tests/test_builder.py b/tests/test_builder.py
index 0fa49d0..39d91b5 100644
--- a/tests/test_builder.py
+++ b/tests/test_builder.py
@@ -264,22 +264,6 @@ def test_osbs_builder_run_brew_user(mocker):
                                      "{'src': 'git://something.redhat.com/containers/openjdk#c5a0731b558c8a247dd7f85b5f54462cd5b68b23', 'target': 'some-branch-containers-candidate', 'opts': {'scratch': True, 'git_branch': 'some-branch', 'yum_repourls': []}}"])
 
 
-def test_osbs_builder_run_brew_target_defined_on_cli(mocker):
-    config.cfg['common'] = {'redhat': True}
-    params = {'koji_target': 'Foo'}
-
-    check_output = mocker.patch.object(subprocess, 'check_output', autospec=True, side_effect=[
-                                       b'ssh://user:password@something.redhat.com/containers/openjdk', b'c5a0731b558c8a247dd7f85b5f54462cd5b68b23', b'12345'])
-    builder = create_builder_object(mocker, 'osbs', params)
-    builder.generator = Map({'image': Map({})})
-    mocker.patch.object(builder, '_wait_for_osbs_task')
-    builder.dist_git.branch = "some-branch"
-    builder.run()
-
-    check_output.assert_called_with(['/usr/bin/brew', 'call', '--python', 'buildContainer', '--kwargs',
-                                     "{'src': 'git://something.redhat.com/containers/openjdk#c5a0731b558c8a247dd7f85b5f54462cd5b68b23', 'target': 'Foo', 'opts': {'scratch': True, 'git_branch': 'some-branch', 'yum_repourls': []}}"])
-
-
 def test_osbs_builder_run_brew_target_defined_in_descriptor(mocker):
     config.cfg['common'] = {'redhat': True}
 
diff --git a/tests/test_integ_builder_osbs.py b/tests/test_integ_builder_osbs.py
index 342e18e..60658bd 100644
--- a/tests/test_integ_builder_osbs.py
+++ b/tests/test_integ_builder_osbs.py
@@ -448,24 +448,3 @@ def test_osbs_builder_with_koji_target_in_descriptor(tmpdir, mocker, caplog):
     run_osbs(descriptor, str(tmpdir), mocker)
 
     assert "About to execute '/usr/bin/brew call --python buildContainer --kwargs {'src': 'git://somehost.com/containers/somerepo#3b9283cb26b35511517ff5c0c3e11f490cba8feb', 'target': 'some-target', 'opts': {'scratch': True, 'git_branch': 'branch', 'yum_repourls': []}}'." in caplog.text
-
-
-# TODO: Remove in 3.6
-def test_osbs_builder_with_koji_target_in_descriptor_and_overriden_in_cli(tmpdir, mocker, caplog):
-    mocker.patch('cekit.tools.decision', return_value=True)
-    mocker.patch('cekit.descriptor.resource.urlopen')
-    mocker.patch.object(subprocess, 'call')
-    mocker.patch.object(subprocess, 'check_call')
-
-    tmpdir.mkdir('osbs').mkdir('repo').mkdir(
-        '.git').join('other').write_text(u'Some content', 'utf8')
-
-    descriptor = image_descriptor.copy()
-
-    descriptor['osbs']['koji_target'] = 'some-target'
-
-    run_osbs(descriptor, str(tmpdir), mocker, build_command=[
-             'build', 'osbs', '--koji-target', 'custom-target'])
-
-    assert "The '--koji-target' switch is deprecated, please use overrides (http://docs.cekit.io/en/latest/handbook/overrides.html) to adjust the koji target, '--koji-target' will be removed in version 3.6" in caplog.text
-    assert "About to execute '/usr/bin/brew call --python buildContainer --kwargs {'src': 'git://somehost.com/containers/somerepo#3b9283cb26b35511517ff5c0c3e11f490cba8feb', 'target': 'custom-target', 'opts': {'scratch': True, 'git_branch': 'branch', 'yum_repourls': []}}'." in caplog.text
diff --git a/tests/test_unit_args.py b/tests/test_unit_args.py
index 0d9878b..7ac1f16 100644
--- a/tests/test_unit_args.py
+++ b/tests/test_unit_args.py
@@ -83,7 +83,7 @@ def _get_class_by_name(clazz):
         {
             'descriptor': 'image.yaml', 'verbose': False, 'work_dir': '~/.cekit', 'config': '~/.cekit/config',
             'redhat': False, 'target': 'target', 'validate': False, 'dry_run': False, 'overrides': (), 'nowait': False,
-            'release': False, 'user': None, 'stage': False, 'koji_target': None, 'sync_only': False, 'commit_message': None, 'assume_yes': False
+            'release': False, 'user': None, 'stage': False, 'sync_only': False, 'commit_message': None, 'assume_yes': False
         }
     ),
     # Test setting user for OSBS
@@ -93,7 +93,7 @@ def _get_class_by_name(clazz):
         {
             'descriptor': 'image.yaml', 'verbose': False, 'work_dir': '~/.cekit', 'config': '~/.cekit/config',
             'redhat': False, 'target': 'target', 'validate': False, 'dry_run': False, 'overrides': (), 'nowait': False,
-            'release': False, 'user': 'SOMEUSER', 'stage': False, 'koji_target': None, 'sync_only': False,
+            'release': False, 'user': 'SOMEUSER', 'stage': False, 'sync_only': False,
             'commit_message': None, 'assume_yes': False
         }
     ),
@@ -104,7 +104,7 @@ def _get_class_by_name(clazz):
         {
             'descriptor': 'image.yaml', 'verbose': False, 'work_dir': '~/.cekit', 'config': '~/.cekit/config',
             'redhat': False, 'target': 'target', 'validate': False, 'dry_run': False, 'overrides': (), 'nowait': False,
-            'release': False, 'user': None, 'stage': True, 'koji_target': None, 'sync_only': False, 'commit_message': None, 'assume_yes': False
+            'release': False, 'user': None, 'stage': True, 'sync_only': False, 'commit_message': None, 'assume_yes': False
         }
     ),
     # Test setting nowait for OSBS
@@ -114,7 +114,7 @@ def _get_class_by_name(clazz):
         {
             'descriptor': 'image.yaml', 'verbose': False, 'work_dir': '~/.cekit', 'config': '~/.cekit/config',
             'redhat': False, 'target': 'target', 'validate': False, 'dry_run': False, 'overrides': (), 'nowait': True,
-            'release': False, 'user': None, 'stage': False, 'koji_target': None, 'sync_only': False, 'commit_message': None, 'assume_yes': False
+            'release': False, 'user': None, 'stage': False, 'sync_only': False, 'commit_message': None, 'assume_yes': False
         }
     ),
     (
@@ -141,7 +141,7 @@ def _get_class_by_name(clazz):
         {
             'descriptor': 'image.yaml', 'verbose': False, 'work_dir': '~/.cekit', 'config': '~/.cekit/config',
             'redhat': False, 'target': 'target', 'validate': False, 'dry_run': False, 'overrides': (), 'release': False,
-            'user': None, 'nowait': False, 'stage': False, 'koji_target': None, 'sync_only': False, 'commit_message': None, 'assume_yes': False
+            'user': None, 'nowait': False, 'stage': False, 'sync_only': False, 'commit_message': None, 'assume_yes': False
         }),
     (
         ['build', 'docker'],

pip install -e .
parse_log_pytest
requirements.txt
pytest pytest-cov pytest-xdist pytest-mock pytest-asyncio
apt-get update apt-get install -y gcc
3.6
requirements.txt
pytest --no-header -rA --tb=line --color=no -p no:cacheprovider -W ignore::DeprecationWarning
attrs==22.2.0
-e git+https://github.com/cekit/cekit.git@3c6cb845a04c83a334da425745221726484dc95c#egg=cekit
certifi==2021.5.30
click==8.0.4
colorlog==6.9.0
coverage==6.2
docopt==0.6.2
execnet==1.9.0
importlib-metadata==4.8.3
iniconfig==1.1.1
Jinja2==3.0.3
MarkupSafe==2.0.1
packaging==21.3
pluggy==1.0.0
py==1.11.0
pykwalify==1.8.0
pyparsing==3.1.4
pytest==7.0.1
pytest-asyncio==0.16.0
pytest-cov==4.0.0
pytest-mock==3.6.1
pytest-xdist==3.0.2
python-dateutil==2.9.0.post0
PyYAML==6.0.1
ruamel.yaml==0.18.3
ruamel.yaml.clib==0.2.8
six==1.17.0
tomli==1.2.3
typing_extensions==4.1.1
zipp==3.6.0

name: cekit
channels:
  - defaults
  - https://repo.anaconda.com/pkgs/main
  - https://repo.anaconda.com/pkgs/r
  - conda-forge
dependencies:
  - _libgcc_mutex=0.1=main
  - _openmp_mutex=5.1=1_gnu
  - ca-certificates=2025.2.25=h06a4308_0
  - certifi=2021.5.30=py36h06a4308_0
  - ld_impl_linux-64=2.40=h12ee557_0
  - libffi=3.3=he6710b0_2
  - libgcc-ng=11.2.0=h1234567_1
  - libgomp=11.2.0=h1234567_1
  - libstdcxx-ng=11.2.0=h1234567_1
  - ncurses=6.4=h6a678d5_0
  - openssl=1.1.1w=h7f8727e_0
  - pip=21.2.2=py36h06a4308_0
  - python=3.6.13=h12debd9_1
  - readline=8.2=h5eee18b_0
  - setuptools=58.0.4=py36h06a4308_0
  - sqlite=3.45.3=h5eee18b_0
  - tk=8.6.14=h39e8969_0
  - wheel=0.37.1=pyhd3eb1b0_0
  - xz=5.6.4=h5eee18b_1
  - zlib=1.2.13=h5eee18b_1
  - pip:
      - attrs==22.2.0
      - click==8.0.4
      - colorlog==6.9.0
      - coverage==6.2
      - docopt==0.6.2
      - execnet==1.9.0
      - importlib-metadata==4.8.3
      - iniconfig==1.1.1
      - jinja2==3.0.3
      - markupsafe==2.0.1
      - packaging==21.3
      - pluggy==1.0.0
      - py==1.11.0
      - pykwalify==1.8.0
      - pyparsing==3.1.4
      - pytest==7.0.1
      - pytest-asyncio==0.16.0
      - pytest-cov==4.0.0
      - pytest-mock==3.6.1
      - pytest-xdist==3.0.2
      - python-dateutil==2.9.0.post0
      - pyyaml==6.0.1
      - ruamel-yaml==0.18.3
      - ruamel-yaml-clib==0.2.8
      - six==1.17.0
      - tomli==1.2.3
      - typing-extensions==4.1.1
      - zipp==3.6.0
prefix: /opt/conda/envs/cekit

tests/test_unit_args.py::test_args_command[args6-cekit.builders.osbs.OSBSBuilder-params6] tests/test_unit_args.py::test_args_command[args7-cekit.builders.osbs.OSBSBuilder-params7] tests/test_unit_args.py::test_args_command[args8-cekit.builders.osbs.OSBSBuilder-params8] tests/test_unit_args.py::test_args_command[args9-cekit.builders.osbs.OSBSBuilder-params9] tests/test_unit_args.py::test_args_command[args12-cekit.builders.osbs.OSBSBuilder-params12]
tests/test_builder.py::test_docker_build_default_tags tests/test_builder.py::test_docker_squashing_enabled tests/test_builder.py::test_docker_squashing_disabled tests/test_builder.py::test_docker_squashing_parameters tests/test_builder.py::test_docker_squashing_disabled_dependencies tests/test_integ_builder_osbs.py::test_osbs_builder_with_asume_yes tests/test_integ_builder_osbs.py::test_osbs_builder_with_push_with_sync_only tests/test_integ_builder_osbs.py::test_osbs_builder_kick_build_without_push tests/test_integ_builder_osbs.py::test_osbs_builder_kick_build_with_push tests/test_integ_builder_osbs.py::test_osbs_builder_add_help_file tests/test_integ_builder_osbs.py::test_osbs_builder_add_extra_files tests/test_integ_builder_osbs.py::test_osbs_builder_add_extra_files_from_custom_dir tests/test_integ_builder_osbs.py::test_osbs_builder_extra_default tests/test_integ_builder_osbs.py::test_osbs_builder_add_files_to_dist_git_without_dotgit_directory tests/test_integ_builder_osbs.py::test_osbs_builder_with_koji_target_based_on_branch tests/test_integ_builder_osbs.py::test_osbs_builder_with_koji_target_in_descriptor tests/test_unit_args.py::test_args_not_valid_command tests/test_unit_args.py::test_args_invalid_build_engine
tests/test_builder.py::test_osbs_builder_defaults tests/test_builder.py::test_osbs_builder_redhat tests/test_builder.py::test_osbs_builder_use_rhpkg_stage tests/test_builder.py::test_osbs_builder_custom_commit_msg tests/test_builder.py::test_osbs_builder_nowait tests/test_builder.py::test_osbs_builder_user tests/test_builder.py::test_merge_container_yaml_no_limit_arch tests/test_builder.py::test_merge_container_yaml_limit_arch tests/test_builder.py::test_osbs_builder_run_brew_stage tests/test_builder.py::test_osbs_builder_run_brew tests/test_builder.py::test_osbs_builder_run_koji tests/test_builder.py::test_osbs_builder_run_brew_nowait tests/test_builder.py::test_osbs_builder_run_brew_user tests/test_builder.py::test_osbs_builder_run_brew_target_defined_in_descriptor tests/test_builder.py::test_osbs_wait_for_osbs_task_finished_successfully tests/test_builder.py::test_osbs_wait_for_osbs_task_in_progress tests/test_builder.py::test_osbs_wait_for_osbs_task_failed tests/test_builder.py::test_osbs_copy_artifacts_to_dist_git[artifact0-image/some-path.jar-osbs/repo/some-path.jar] tests/test_builder.py::test_osbs_copy_artifacts_to_dist_git[artifact1-image/some-name-osbs/repo/some-name] tests/test_builder.py::test_osbs_copy_artifacts_to_dist_git[artifact2-image/some-target.jar-osbs/repo/some-target.jar] tests/test_builder.py::test_osbs_copy_artifacts_to_dist_git[artifact3-image/some-name-osbs/repo/some-name] tests/test_builder.py::test_osbs_copy_artifacts_to_dist_git[artifact4-image/some-target.jar-osbs/repo/some-target.jar] tests/test_builder.py::test_docker_builder_defaults tests/test_builder.py::test_osbs_dist_git_sync_called tests/test_builder.py::test_osbs_dist_git_sync_NOT_called_when_dry_run_set tests/test_builder.py::test_buildah_builder_run tests/test_builder.py::test_buildah_builder_run_pull tests/test_builder.py::test_podman_builder_run tests/test_builder.py::test_podman_builder_run_pull tests/test_builder.py::test_podman_builder_run_with_generator tests/test_builder.py::test_buildah_builder_run_with_generator tests/test_builder.py::test_buildah_builder_with_squashing_disabled tests/test_builder.py::test_podman_builder_with_squashing_disabled tests/test_unit_args.py::test_args_command[args0-cekit.builders.docker_builder.DockerBuilder-params0] tests/test_unit_args.py::test_args_command[args1-cekit.builders.docker_builder.DockerBuilder-params1] tests/test_unit_args.py::test_args_command[args2-cekit.builders.docker_builder.DockerBuilder-params2] tests/test_unit_args.py::test_args_command[args3-cekit.builders.docker_builder.DockerBuilder-params3] tests/test_unit_args.py::test_args_command[args4-cekit.builders.docker_builder.DockerBuilder-params4] tests/test_unit_args.py::test_args_command[args5-cekit.builders.docker_builder.DockerBuilder-params5] tests/test_unit_args.py::test_args_command[args10-cekit.test.behave_tester.BehaveTester-params10] tests/test_unit_args.py::test_args_command[args11-cekit.builders.docker_builder.DockerBuilder-params11] tests/test_unit_args.py::test_args_command[args13-cekit.builders.docker_builder.DockerBuilder-params13] tests/test_unit_args.py::test_args_command[args14-cekit.builders.buildah.BuildahBuilder-params14]
cekit/builder.py cekit/builders/osbs.py docs/handbook/building/builder-engines.rst cekit/cli.py
cekit/builder.py cekit/builders/osbs.py docs/handbook/building/builder-engines.rst cekit/cli.py