diff --git a/.github/workflows/cron-other.yml b/.github/workflows/cron-other.yml
index 7d52a21dec..035b72c881 100644
--- a/.github/workflows/cron-other.yml
+++ b/.github/workflows/cron-other.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.7, 3.8, 3.9]
         os: ["windows-latest", "ubuntu-latest"]
     env:
       QISKIT_IBM_RUNTIME_API_TOKEN: ${{ secrets.QISKIT_IBM_RUNTIME_API_TOKEN }}
@@ -49,7 +49,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.7, 3.8, 3.9]
         os: ["windows-latest", "ubuntu-latest"]
     env:
       QISKIT_IBM_RUNTIME_API_TOKEN: ${{ secrets.QISKIT_IBM_RUNTIME_API_TOKEN }}
@@ -77,7 +77,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.7, 3.8, 3.9]
         os: ["windows-latest", "ubuntu-latest"]
     env:
       QISKIT_IBM_RUNTIME_API_TOKEN: ${{ secrets.QISKIT_IBM_RUNTIME_API_TOKEN }}
diff --git a/.github/workflows/cron-prod.yml b/.github/workflows/cron-prod.yml
index baa66cde9f..5878dc54c6 100644
--- a/.github/workflows/cron-prod.yml
+++ b/.github/workflows/cron-prod.yml
@@ -15,10 +15,10 @@ jobs:
       QISKIT_IN_PARALLEL: True
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Python 3.8
+      - name: Set up Python 3.9
         uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: 3.9
       - name: Install Deps
         run: |
           python -m pip install --upgrade pip
diff --git a/.github/workflows/cron-slow.yml b/.github/workflows/cron-slow.yml
index 418550b2fd..a5c3203dee 100644
--- a/.github/workflows/cron-slow.yml
+++ b/.github/workflows/cron-slow.yml
@@ -29,10 +29,10 @@ jobs:
       QISKIT_IN_PARALLEL: True
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Python 3.6
+      - name: Set up Python 3.9
         uses: actions/setup-python@v2
         with:
-          python-version: 3.6
+          python-version: 3.9
       - name: Install Deps
         run: |
           python -m pip install --upgrade pip
@@ -54,10 +54,10 @@ jobs:
       QISKIT_IN_PARALLEL: True
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Python 3.8
+      - name: Set up Python 3.9
         uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: 3.9
       - name: Install Deps
         run: |
           python -m pip install --upgrade pip
diff --git a/.github/workflows/cron-staging.yml b/.github/workflows/cron-staging.yml
index 0d9acadc67..29a6538f0e 100644
--- a/.github/workflows/cron-staging.yml
+++ b/.github/workflows/cron-staging.yml
@@ -28,10 +28,10 @@ jobs:
       QISKIT_IN_PARALLEL: True
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Python 3.8
+      - name: Set up Python 3.9
         uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: 3.9
       - name: Install Deps
         run: |
           python -m pip install --upgrade pip
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 601434b7a5..1acdafa996 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7]
+        python-version: [3.9]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 540f1b10e3..f2e9a954ad 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -15,7 +15,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: '3.7.8'
+        python-version: '3.9.9'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9f34ea6ce0..9b8c179ff5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,10 +18,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Python 3.7
+      - name: Set up Python 3.9
         uses: actions/setup-python@v2
         with:
-          python-version: 3.7
+          python-version: 3.9
       - name: Install Deps
         run: |
           python -m pip install --upgrade pip
@@ -39,10 +39,10 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Set up Python 3.7
+      - name: Set up Python 3.9
         uses: actions/setup-python@v2
         with:
-          python-version: 3.7
+          python-version: 3.9
       - name: Install Deps
         run: |
           python -m pip install --upgrade pip
@@ -61,7 +61,7 @@ jobs:
     runs-on: macOS-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.7, 3.8, 3.9]
     env:
       QISKIT_IBM_RUNTIME_API_TOKEN: ${{ secrets.QISKIT_IBM_RUNTIME_API_TOKEN }}
       QISKIT_IBM_RUNTIME_API_URL: ${{ secrets.QISKIT_IBM_RUNTIME_API_URL }}
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 334cb617b9..c5bd027614 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.7, 3.8, 3.9]
         os: ["macOS-latest", "ubuntu-latest", "windows-latest"]
     env:
       QISKIT_IBM_RUNTIME_API_TOKEN: ${{ secrets.QISKIT_IBM_RUNTIME_API_TOKEN }}
@@ -47,10 +47,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Python 3.7
+      - name: Set up Python 3.9
         uses: actions/setup-python@v2
         with:
-          python-version: 3.7
+          python-version: 3.9
       - name: Install Deps
         run: |
           python -m pip install --upgrade pip
@@ -68,10 +68,10 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Set up Python 3.7
+      - name: Set up Python 3.9
         uses: actions/setup-python@v2
         with:
-          python-version: 3.7
+          python-version: 3.9
       - name: Install Deps
         run: |
           python -m pip install --upgrade pip
diff --git a/.pylintrc b/.pylintrc
index a90abc2627..d3b190571f 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -1,265 +1,313 @@
 [MASTER]
 
-# Specify a configuration file.
-#rcfile=
+# A comma-separated list of package or module names from where C extensions may
+# be loaded. Extensions are loading into the active Python interpreter and may
+# run arbitrary code.
+extension-pkg-allow-list=
 
-# Python code to execute, usually for sys.path manipulation such as
-# pygtk.require().
-#init-hook=
+# A comma-separated list of package or module names from where C extensions may
+# be loaded. Extensions are loading into the active Python interpreter and may
+# run arbitrary code. (This is an alternative name to extension-pkg-allow-list
+# for backward compatibility.)
+extension-pkg-whitelist=
 
-# Add files or directories to the blacklist. They should be base names, not
-# paths.
+# Specify a score threshold to be exceeded before program exits with error.
+fail-under=10.0
+
+# Files or directories to be skipped. They should be base names, not paths.
 ignore=CVS
 
-# Add files or directories matching the regex patterns to the blacklist. The
-# regex matches against base names, not paths.
+# Files or directories matching the regex patterns are skipped. The regex
+# matches against base names, not paths.
 ignore-patterns=
 
-# Pickle collected data for later comparisons.
-persistent=yes
+# Python code to execute, usually for sys.path manipulation such as
+# pygtk.require().
+#init-hook=
 
-# List of plugins (as comma separated values of python modules names) to load,
+# Use multiple processes to speed up Pylint. Specifying 0 will auto-detect the
+# number of processors available to use.
+jobs=1
+
+# Control the amount of potential inferred values when inferring a single
+# object. This can help the performance when dealing with large functions or
+# complex, nested conditions.
+limit-inference-results=100
+
+# List of plugins (as comma separated values of python module names) to load,
 # usually to register additional checkers.
 load-plugins=pylint.extensions.docparams, # enable checking of docstring args
-    pylint.extensions.docstyle,  # basic docstring style checks
+             pylint.extensions.docstyle,  # basic docstring style checks
 
-# Use multiple processes to speed up Pylint.
-jobs=1
+# Pickle collected data for later comparisons.
+persistent=yes
+
+# When enabled, pylint would attempt to guess common misconfiguration and emit
+# user-friendly hints instead of false-positive error messages.
+suggestion-mode=yes
 
 # Allow loading of arbitrary C extensions. Extensions are imported into the
 # active Python interpreter and may run arbitrary code.
 unsafe-load-any-extension=no
 
-# A comma-separated list of package or module names from where C extensions may
-# be loaded. Extensions are loading into the active Python interpreter and may
-# run arbitrary code
-extension-pkg-whitelist=numpy
-
 
 [MESSAGES CONTROL]
 
 # Only show warnings with the listed confidence levels. Leave empty to show
-# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED
+# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED.
 confidence=
 
-# Enable the message, report, category or checker with the given id(s). You can
-# either give multiple identifier separated by comma (,) or put this option
-# multiple time (only on the command line, not in the configuration file where
-# it should appear only once). See also the "--disable" option for examples.
-#enable=
-
 # Disable the message, report, category or checker with the given id(s). You
 # can either give multiple identifiers separated by comma (,) or put this
 # option multiple times (only on the command line, not in the configuration
-# file where it should appear only once).You can also use "--disable=all" to
+# file where it should appear only once). You can also use "--disable=all" to
 # disable everything first and then reenable specific checks. For example, if
 # you want to run only the similarities checker, you can use "--disable=all
 # --enable=similarities". If you want to run only the classes checker, but have
-# no Warning level messages displayed, use"--disable=all --enable=classes
-# --disable=W"
-disable=no-self-use,        # disabled as it is too verbose
-    fixme,              # disabled as TODOs would show up as warnings
-    protected-access,   # disabled as we don't follow the public vs private
-                        # convention strictly
-    duplicate-code,     # disabled as it is too verbose
-    redundant-returns-doc, # for @abstractmethod, it cannot interpret "pass"
-    # disable the "too-many/few-..." refactoring hints
-    too-many-lines, too-many-branches, too-many-locals, too-many-nested-blocks,
-    too-many-statements, too-many-instance-attributes, too-many-arguments,
-    too-many-public-methods, too-few-public-methods, too-many-ancestors,
-    unnecessary-pass,   # allow for methods with just "pass", for clarity
-    no-else-return,     # relax "elif" after a clause with a return
-    missing-yield-doc,      # in coroutines, these checks can yield false
-    missing-yield-type-doc,  # positives (pun intended)
-    import-outside-toplevel,
-    docstring-first-line-empty,
-    no-name-in-module,  # remove when pylint behaves
-    import-error,    # remove when pylint behaves
-    bad-continuation, bad-whitespace # differences of opinion with black
+# no Warning level messages displayed, use "--disable=all --enable=classes
+# --disable=W".
+disable=arguments-renamed,              # TODO: investigate / re-enable
+        bad-mcs-classmethod-argument,   # TODO: investigate / re-enable
+        consider-iterating-dictionary,  # TODO: investigate / re-enable
+        consider-using-dict-items,      # TODO: investigate / re-enable
+        consider-using-f-string,        # TODO: investigate / re-enable
+        consider-using-with,            # TODO: investigate / re-enable
+        differing-param-doc,            # TODO: investigate / re-enable
+        docstring-first-line-empty,     # TODO: investigate / re-enable
+        duplicate-code,                 # too verbose
+        f-string-without-interpolation, # TODO: investigate / re-enable
+        fixme,                          # avoid that to do annotations show up as warnings
+        invalid-name,                   # TODO: investigate / re-enable
+        missing-param-doc,              # TODO: investigate / re-enable (issues with kwargs docs)
+        missing-type-doc,               # TODO: investigate / re-enable
+        no-else-return,                 # relax "elif" after a clause with a return
+        no-member,                      # TODO: investigate / re-enable
+        no-self-use,                    # too verbose
+        protected-access,               # we don't strictly follow the public vs. private convention
+        raise-missing-from,             # TODO: investigate / re-enable
+        redundant-returns-doc,          # TODO: investigate / re-enable
+        super-with-arguments,           # TODO: investigate / re-enable
+        too-few-public-methods,         # too verbose
+        too-many-ancestors,             # too verbose
+        too-many-arguments,             # too verbose
+        too-many-branches,              # too verbose
+        too-many-instance-attributes,   # too verbose
+        too-many-lines,                 # too verbose
+        too-many-locals,                # too verbose
+        too-many-nested-blocks,         # too verbose
+        too-many-public-methods,        # too verbose
+        too-many-statements,            # too verbose
+        unnecessary-pass,               # allow for methods with just "pass", for clarity
+        unspecified-encoding,           # TODO: investigate / re-enable
+        use-dict-literal,               # TODO: investigate / re-enable
+        use-list-literal,               # TODO: investigate / re-enable
+
+# Enable the message, report, category or checker with the given id(s). You can
+# either give multiple identifier separated by comma (,) or put this option
+# multiple time (only on the command line, not in the configuration file where
+# it should appear only once). See also the "--disable" option for examples.
+enable=c-extension-no-member
 
 
 [REPORTS]
 
-# Set the output format. Available formats are text, parseable, colorized, msvs
-# (visual studio) and html. You can also give a reporter class, eg
+# Python expression which should return a score less than or equal to 10. You
+# have access to the variables 'error', 'warning', 'refactor', and 'convention'
+# which contain the number of messages in each category, as well as 'statement'
+# which is the total number of statements analyzed. This score is used by the
+# global evaluation report (RP0004).
+evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
+
+# Template used to display messages. This is a python new-style format string
+# used to format the message information. See doc for all details.
+#msg-template=
+
+# Set the output format. Available formats are text, parseable, colorized, json
+# and msvs (visual studio). You can also give a reporter class, e.g.
 # mypackage.mymodule.MyReporterClass.
 output-format=text
 
-# Put messages in a separate file for each module / package specified on the
-# command line instead of printing them on stdout. Reports (if any) will be
-# written in a file name "pylint_global.[txt|html]". This option is deprecated
-# and it will be removed in Pylint 2.0.
-files-output=no
+# Tells whether to display a full report or only the messages.
+reports=no
 
-# Tells whether to display a full report or only the messages
-reports=yes
+# Activate the evaluation score.
+score=yes
 
-# Python expression which should return a note less than 10 (10 is the highest
-# note). You have access to the variables errors warning, statement which
-# respectively contain the number of errors / warnings messages and the total
-# number of statements analyzed. This is used by the global evaluation report
-# (RP0004).
-evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
 
-# Template used to display messages. This is a python new-style format string
-# used to format the message information. See doc for all details
-#msg-template=
+[REFACTORING]
 
+# Maximum number of nested blocks for function / method body
+max-nested-blocks=5
 
-[BASIC]
+# Complete name of functions that never returns. When checking for
+# inconsistent-return-statements if a never returning function is called then
+# it will be considered as an explicit return statement and no message will be
+# printed.
+never-returning-functions=sys.exit
 
-# Good variable names which should always be accepted, separated by a comma
-# i,j,k = typical indices
-# n,m = typical numbers
-# ex = for exceptions and errors
-# v,w = typical vectors
-# x,y,z = typical axes
-# _ = placeholder name
-# q,r,qr,cr,qc = quantum and classical registers, and quantum circuit
-# pi = the PI constant
-# op = operation iterator
-# b = basis iterator
-good-names=i,j,k,n,m,ex,v,w,x,y,z,Run,_,logger,q,r,qr,cr,qc,pi,op,b,ar,br
-
-# Bad variable names which should always be refused, separated by a comma
-bad-names=foo,bar,toto,tutu,tata
 
-# Colon-delimited sets of names that determine each other's naming style when
-# the name regexes allow several styles.
-name-group=
+[LOGGING]
 
-# Include a hint for the correct naming format with invalid-name
-include-naming-hint=no
+# The type of string formatting that logging methods do. `old` means using %
+# formatting, `new` is for `{}` formatting.
+logging-format-style=old
 
-# List of decorators that produce properties, such as abc.abstractproperty. Add
-# to this list to register other decorators that produce valid properties.
-property-classes=abc.abstractproperty
+# Logging modules to check that the string format arguments are in logging
+# function parameter format.
+logging-modules=logging
 
-# Regular expression matching correct module names
-module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
 
-# Naming hint for module names
-module-name-hint=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
+[SPELLING]
 
-# Regular expression matching correct constant names
-const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$
+# Limits count of emitted suggestions for spelling mistakes.
+max-spelling-suggestions=4
 
-# Naming hint for constant names
-const-name-hint=(([A-Z_][A-Z0-9_]*)|(__.*__))$
+# Spelling dictionary name. Available dictionaries: none. To make it work,
+# install the 'python-enchant' package.
+spelling-dict=
 
-# Regular expression matching correct class names
-class-rgx=[A-Z_][a-zA-Z0-9]+$
+# List of comma separated words that should not be checked.
+spelling-ignore-words=
 
-# Naming hint for class names
-class-name-hint=[A-Z_][a-zA-Z0-9]+$
+# A path to a file that contains the private dictionary; one word per line.
+spelling-private-dict-file=
 
-# Regular expression matching correct function names
-function-rgx=[a-z_][a-z0-9_]{2,30}$
+# Tells whether to store unknown words to the private dictionary (see the
+# --spelling-private-dict-file option) instead of raising a message.
+spelling-store-unknown-words=no
 
-# Naming hint for function names
-function-name-hint=[a-z_][a-z0-9_]{2,30}$
 
-# Regular expression matching correct method names
-method-rgx=(([a-z_][a-z0-9_]{2,49})|(assert[A-Z][a-zA-Z0-9]{2,43}))$
+[MISCELLANEOUS]
 
-# Naming hint for method names
-method-name-hint=[a-z_][a-z0-9_]{2,30}$ or camelCase `assert*` in tests.
+# List of note tags to take in consideration, separated by a comma.
+notes=FIXME,
+      XXX,
+      TODO
 
-# Regular expression matching correct attribute names
-attr-rgx=[a-z_][a-z0-9_]{2,30}$
+# Regular expression of note tags to take in consideration.
+#notes-rgx=
 
-# Naming hint for attribute names
-attr-name-hint=[a-z_][a-z0-9_]{2,30}$
 
-# Regular expression matching correct argument names
-argument-rgx=[a-z_][a-z0-9_]{2,30}$
+[TYPECHECK]
 
-# Naming hint for argument names
-argument-name-hint=[a-z_][a-z0-9_]{2,30}$
+# List of decorators that produce context managers, such as
+# contextlib.contextmanager. Add to this list to register other decorators that
+# produce valid context managers.
+contextmanager-decorators=contextlib.contextmanager
 
-# Regular expression matching correct variable names
-variable-rgx=[a-z_][a-z0-9_]{2,30}$
+# List of members which are set dynamically and missed by pylint inference
+# system, and so shouldn't trigger E1101 when accessed. Python regular
+# expressions are accepted.
+generated-members=
 
-# Naming hint for variable names
-variable-name-hint=[a-z_][a-z0-9_]{2,30}$
+# Tells whether missing members accessed in mixin class should be ignored. A
+# mixin class is detected if its name ends with "mixin" (case insensitive).
+ignore-mixin-members=yes
 
-# Regular expression matching correct class attribute names
-class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
+# Tells whether to warn about missing members when the owner of the attribute
+# is inferred to be None.
+ignore-none=yes
 
-# Naming hint for class attribute names
-class-attribute-name-hint=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
+# This flag controls whether pylint should warn about no-member and similar
+# checks whenever an opaque object is returned when inferring. The inference
+# can return multiple potential results while evaluating a Python object, but
+# some branches might not be evaluated, which results in partial inference. In
+# that case, it might be useful to still emit no-member and other checks for
+# the rest of the inferred objects.
+ignore-on-opaque-inference=yes
 
-# Regular expression matching correct inline iteration names
-inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
+# List of class names for which member attributes should not be checked (useful
+# for classes with dynamically set attributes). This supports the use of
+# qualified names.
+ignored-classes=optparse.Values,thread._local,_thread._local
 
-# Naming hint for inline iteration names
-inlinevar-name-hint=[A-Za-z_][A-Za-z0-9_]*$
+# List of module names for which member attributes should not be checked
+# (useful for modules/projects where namespaces are manipulated during runtime
+# and thus existing member attributes cannot be deduced by static analysis). It
+# supports qualified module names, as well as Unix pattern matching.
+ignored-modules=
 
-# Regular expression which should only match function or class names that do
-# not require a docstring.
-no-docstring-rgx=^_
+# Show a hint with possible names when a member name was not found. The aspect
+# of finding the hint is based on edit distance.
+missing-member-hint=yes
 
-# Minimum line length for functions/classes that require docstrings, shorter
-# ones are exempt.
-docstring-min-length=-1
+# The minimum edit distance a name should have in order to be considered a
+# similar match for a missing member name.
+missing-member-hint-distance=1
 
+# The total number of similar names that should be taken in consideration when
+# showing a hint for a missing member.
+missing-member-max-choices=1
 
-[ELIF]
+# List of decorators that change the signature of a decorated function.
+signature-mutators=
 
-# Maximum number of nested blocks for function / method body
-max-nested-blocks=5
 
+[VARIABLES]
 
-[FORMAT]
+# List of additional names supposed to be defined in builtins. Remember that
+# you should avoid defining new builtins when possible.
+additional-builtins=
 
-# Maximum number of characters on a single line.
-max-line-length=105
+# Tells whether unused global variables should be treated as a violation.
+allow-global-unused-variables=yes
 
-# Regexp for a line that is allowed to be longer than the limit.
-ignore-long-lines=^\s*(# )?<?https?://\S+>?$
+# List of names allowed to shadow builtins
+allowed-redefined-builtins=
 
-# Allow the body of an if to be on the same line as the test if there is no
-# else.
-single-line-if-stmt=no
+# List of strings which can identify a callback function by name. A callback
+# name must start or end with one of those strings.
+callbacks=cb_,
+          _cb
 
-# List of optional constructs for which whitespace checking is disabled. `dict-
-# separator` is used to allow tabulation in dicts, etc.: {1  : 1,\n222: 2}.
-# `trailing-comma` allows a space between comma and closing bracket: (a, ).
-# `empty-line` allows space-only lines.
-no-space-check=trailing-comma,dict-separator
+# A regular expression matching the name of dummy variables (i.e. expected to
+# not be used).
+dummy-variables-rgx=_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_
 
-# Maximum number of lines in a module
-max-module-lines=1000
+# Argument names that match this expression will be ignored. Default to name
+# with leading underscore.
+ignored-argument-names=_.*|^ignored_|^unused_
 
-# String used as indentation unit. This is usually "    " (4 spaces) or "\t" (1
-# tab).
-indent-string='    '
+# Tells whether we should check for unused import in __init__ files.
+init-import=no
 
-# Number of spaces of indent required inside a hanging  or continued line.
-indent-after-paren=4
+# List of qualified module names which can have objects that can redefine
+# builtins.
+redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io
+
+
+[FORMAT]
 
 # Expected format of line ending, e.g. empty (any line ending), LF or CRLF.
 expected-line-ending-format=
 
+# Regexp for a line that is allowed to be longer than the limit.
+ignore-long-lines=^\s*(# )?<?https?://\S+>?$
 
-[LOGGING]
+# Number of spaces of indent required inside a hanging or continued line.
+indent-after-paren=4
 
-# Logging modules to check that the string format arguments are in logging
-# function parameter format
-logging-modules=logging
+# String used as indentation unit. This is usually "    " (4 spaces) or "\t" (1
+# tab).
+indent-string='    '
 
+# Maximum number of characters on a single line.
+max-line-length=105
 
-[MISCELLANEOUS]
+# Maximum number of lines in a module.
+max-module-lines=1000
 
-# List of note tags to take in consideration, separated by a comma.
-notes=FIXME,XXX,TODO
+# Allow the body of a class to be on the same line as the declaration if body
+# contains single statement.
+single-line-class-stmt=no
+
+# Allow the body of an if to be on the same line as the test if there is no
+# else.
+single-line-if-stmt=no
 
 
 [SIMILARITIES]
 
-# Minimum lines number of a similarity.
-min-similarity-lines=4
-
 # Ignore comments when computing similarities.
 ignore-comments=yes
 
@@ -269,142 +317,173 @@ ignore-docstrings=yes
 # Ignore imports when computing similarities.
 ignore-imports=no
 
+# Minimum lines number of a similarity.
+min-similarity-lines=4
 
-[SPELLING]
 
-# Spelling dictionary name. Available dictionaries: none. To make it working
-# install python-enchant package.
-spelling-dict=
+[BASIC]
 
-# List of comma separated words that should not be checked.
-spelling-ignore-words=
+# Naming style matching correct argument names.
+argument-naming-style=snake_case
 
-# A path to a file that contains private dictionary; one word per line.
-spelling-private-dict-file=
+# Regular expression matching correct argument names. Overrides argument-
+# naming-style.
+#argument-rgx=
 
-# Tells whether to store unknown words to indicated private dictionary in
-# --spelling-private-dict-file option instead of raising a message.
-spelling-store-unknown-words=no
+# Naming style matching correct attribute names.
+attr-naming-style=snake_case
 
+# Regular expression matching correct attribute names. Overrides attr-naming-
+# style.
+#attr-rgx=
 
-[TYPECHECK]
+# Bad variable names which should always be refused, separated by a comma.
+bad-names=foo,
+          bar,
+          baz,
+          toto,
+          tutu,
+          tata
 
-# Tells whether missing members accessed in mixin class should be ignored. A
-# mixin class is detected if its name ends with "mixin" (case insensitive).
-ignore-mixin-members=yes
+# Bad variable names regexes, separated by a comma. If names match any regex,
+# they will always be refused
+bad-names-rgxs=
 
-# List of module names for which member attributes should not be checked
-# (useful for modules/projects where namespaces are manipulated during runtime
-# and thus existing member attributes cannot be deduced by static analysis. It
-# supports qualified module names, as well as Unix pattern matching.
-ignored-modules=matplotlib.cm
+# Naming style matching correct class attribute names.
+class-attribute-naming-style=any
 
-# List of class names for which member attributes should not be checked (useful
-# for classes with dynamically set attributes). This supports the use of
-# qualified names.
-ignored-classes=optparse.Values,thread._local,_thread._local,QuantumCircuit
+# Regular expression matching correct class attribute names. Overrides class-
+# attribute-naming-style.
+#class-attribute-rgx=
 
-# List of members which are set dynamically and missed by pylint inference
-# system, and so shouldn't trigger E1101 when accessed. Python regular
-# expressions are accepted.
-generated-members=requests.codes.ok
+# Naming style matching correct class constant names.
+class-const-naming-style=UPPER_CASE
 
-# List of decorators that produce context managers, such as
-# contextlib.contextmanager. Add to this list to register other decorators that
-# produce valid context managers.
-contextmanager-decorators=contextlib.contextmanager
+# Regular expression matching correct class constant names. Overrides class-
+# const-naming-style.
+#class-const-rgx=
 
+# Naming style matching correct class names.
+class-naming-style=PascalCase
 
-[VARIABLES]
+# Regular expression matching correct class names. Overrides class-naming-
+# style.
+#class-rgx=
 
-# Tells whether we should check for unused import in __init__ files.
-init-import=no
-
-# A regular expression matching the name of dummy variables (i.e. expectedly
-# not used).
-dummy-variables-rgx=(_+[a-zA-Z0-9]*?$)|dummy
+# Naming style matching correct constant names.
+const-naming-style=UPPER_CASE
 
-# List of additional names supposed to be defined in builtins. Remember that
-# you should avoid to define new builtins when possible.
-additional-builtins=
+# Regular expression matching correct constant names. Overrides const-naming-
+# style.
+#const-rgx=
 
-# List of strings which can identify a callback function by name. A callback
-# name must start or end with one of those strings.
-callbacks=cb_,_cb
+# Minimum line length for functions/classes that require docstrings, shorter
+# ones are exempt.
+docstring-min-length=-1
 
-# List of qualified module names which can have objects that can redefine
-# builtins.
-redefining-builtins-modules=six.moves,future.builtins
+# Naming style matching correct function names.
+function-naming-style=snake_case
 
+# Regular expression matching correct function names. Overrides function-
+# naming-style.
+#function-rgx=
 
-[CLASSES]
+# Good variable names which should always be accepted, separated by a comma.
+good-names=i,
+           j,
+           k,
+           ex,
+           Run,
+           _
 
-# List of method names used to declare (i.e. assign) instance attributes.
-defining-attr-methods=__init__,__new__,setUp
+# Good variable names regexes, separated by a comma. If names match any regex,
+# they will always be accepted
+good-names-rgxs=
 
-# List of valid names for the first argument in a class method.
-valid-classmethod-first-arg=cls
+# Include a hint for the correct naming format with invalid-name.
+include-naming-hint=no
 
-# List of valid names for the first argument in a metaclass class method.
-valid-metaclass-classmethod-first-arg=mcs
+# Naming style matching correct inline iteration names.
+inlinevar-naming-style=any
 
-# List of member names, which should be excluded from the protected access
-# warning.
-exclude-protected=_asdict,_fields,_replace,_source,_make
+# Regular expression matching correct inline iteration names. Overrides
+# inlinevar-naming-style.
+#inlinevar-rgx=
 
+# Naming style matching correct method names.
+method-naming-style=snake_case
 
-[DESIGN]
+# Regular expression matching correct method names. Overrides method-naming-
+# style.
+#method-rgx=
 
-# Maximum number of arguments for function / method
-max-args=8
+# Naming style matching correct module names.
+module-naming-style=snake_case
 
-# Argument names that match this expression will be ignored. Default to name
-# with leading underscore
-ignored-argument-names=_.*
+# Regular expression matching correct module names. Overrides module-naming-
+# style.
+#module-rgx=
 
-# Maximum number of locals for function / method body
-max-locals=15
+# Colon-delimited sets of names that determine each other's naming style when
+# the name regexes allow several styles.
+name-group=
 
-# Maximum number of return / yield for function / method body
-max-returns=6
+# Regular expression which should only match function or class names that do
+# not require a docstring.
+no-docstring-rgx=^_
 
-# Maximum number of branch for function / method body
-max-branches=12
+# List of decorators that produce properties, such as abc.abstractproperty. Add
+# to this list to register other decorators that produce valid properties.
+# These decorators are taken in consideration only for invalid-name.
+property-classes=abc.abstractproperty
 
-# Maximum number of statements in function / method body
-max-statements=50
+# Naming style matching correct variable names.
+variable-naming-style=snake_case
 
-# Maximum number of parents for a class (see R0901).
-max-parents=7
+# Regular expression matching correct variable names. Overrides variable-
+# naming-style.
+#variable-rgx=
 
-# Maximum number of attributes for a class (see R0902).
-max-attributes=10
 
-# Minimum number of public methods for a class (see R0903).
-min-public-methods=2
+[STRING]
 
-# Maximum number of public methods for a class (see R0904).
-max-public-methods=35
+# This flag controls whether inconsistent-quotes generates a warning when the
+# character used as a quote delimiter is used inconsistently within a module.
+check-quote-consistency=no
 
-# Maximum number of boolean expressions in a if statement
-max-bool-expr=5
+# This flag controls whether the implicit-str-concat should generate a warning
+# on implicit string concatenation in sequences defined over several lines.
+check-str-concat-over-line-jumps=no
 
 
 [IMPORTS]
 
-# Deprecated modules which should not be used, separated by a comma
-deprecated-modules=optparse
+# List of modules that can be imported at any level, not just the top level
+# one.
+allow-any-import-level=
 
-# Create a graph of every (i.e. internal and external) dependencies in the
-# given file (report RP0402 must not be disabled)
-import-graph=
+# Allow wildcard imports from modules that define __all__.
+allow-wildcard-with-all=no
+
+# Analyse import fallback blocks. This can be used to support both Python 2 and
+# 3 compatible code, which means that the block might have code that exists
+# only in one or another interpreter, leading to false positives when analysed.
+analyse-fallback-blocks=no
+
+# Deprecated modules which should not be used, separated by a comma.
+deprecated-modules=optparse,tkinter.tix
 
-# Create a graph of external dependencies in the given file (report RP0402 must
-# not be disabled)
+# Output a graph (.gv or any supported image format) of external dependencies
+# to the given file (report RP0402 must not be disabled).
 ext-import-graph=
 
-# Create a graph of internal dependencies in the given file (report RP0402 must
-# not be disabled)
+# Output a graph (.gv or any supported image format) of all (i.e. internal and
+# external) dependencies to the given file (report RP0402 must not be
+# disabled).
+import-graph=
+
+# Output a graph (.gv or any supported image format) of internal dependencies
+# to the given file (report RP0402 must not be disabled).
 int-import-graph=
 
 # Force import order to recognize a module as part of the standard
@@ -414,14 +493,72 @@ known-standard-library=
 # Force import order to recognize a module as part of a third party library.
 known-third-party=enchant
 
-# Analyse import fallback blocks. This can be used to support both Python 2 and
-# 3 compatible code, which means that the block might have code that exists
-# only in one or another interpreter, leading to false positives when analysed.
-analyse-fallback-blocks=no
+# Couples of modules and preferred modules, separated by a comma.
+preferred-modules=
+
+
+[CLASSES]
+
+# Warn about protected attribute access inside special methods
+check-protected-access-in-special-methods=no
+
+# List of method names used to declare (i.e. assign) instance attributes.
+defining-attr-methods=__init__,
+                      __new__,
+                      setUp,
+                      __post_init__
+
+# List of member names, which should be excluded from the protected access
+# warning.
+exclude-protected=_asdict,
+                  _fields,
+                  _replace,
+                  _source,
+                  _make
+
+# List of valid names for the first argument in a class method.
+valid-classmethod-first-arg=cls
+
+# List of valid names for the first argument in a metaclass class method.
+valid-metaclass-classmethod-first-arg=cls
+
+
+[DESIGN]
+
+# Maximum number of arguments for function / method.
+max-args=8
+
+# Maximum number of attributes for a class (see R0902).
+max-attributes=7
+
+# Maximum number of boolean expressions in an if statement (see R0916).
+max-bool-expr=5
+
+# Maximum number of branch for function / method body.
+max-branches=12
+
+# Maximum number of locals for function / method body.
+max-locals=15
+
+# Maximum number of parents for a class (see R0901).
+max-parents=7
+
+# Maximum number of public methods for a class (see R0904).
+max-public-methods=35
+
+# Maximum number of return / yield for function / method body.
+max-returns=6
+
+# Maximum number of statements in function / method body.
+max-statements=50
+
+# Minimum number of public methods for a class (see R0903).
+min-public-methods=2
 
 
 [EXCEPTIONS]
 
 # Exceptions that will emit a warning when being caught. Defaults to
-# "Exception"
-overgeneral-exceptions=Exception
+# "BaseException, Exception".
+overgeneral-exceptions=BaseException,
+                       Exception
diff --git a/constraints.txt b/constraints.txt
index ce9c4551f4..21687d3754 100644
--- a/constraints.txt
+++ b/constraints.txt
@@ -1,3 +1 @@
-astroid==2.3.3
-pylint==2.4.4
 traitlets!=5.0.5
diff --git a/qiskit_ibm_runtime/runtime_program.py b/qiskit_ibm_runtime/runtime_program.py
index bdd24fd1f5..30ed8bdc3f 100644
--- a/qiskit_ibm_runtime/runtime_program.py
+++ b/qiskit_ibm_runtime/runtime_program.py
@@ -14,7 +14,7 @@
 
 import logging
 import re
-from typing import Optional, List, Dict
+from typing import Optional, Dict
 from types import SimpleNamespace
 from qiskit_ibm_runtime.exceptions import IBMInputValueError, IBMNotAuthorizedError
 from .exceptions import QiskitRuntimeError, RuntimeProgramNotFound
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 838a50cfd9..79e31720c3 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,5 +1,5 @@
 mypy==0.812
-pylint==2.4.4
+pylint==2.12.1
 vcrpy
 pproxy==2.1.8
 Sphinx>=1.8.3
diff --git a/setup.py b/setup.py
index 0969933840..09966b4e0a 100644
--- a/setup.py
+++ b/setup.py
@@ -61,7 +61,6 @@
         "Operating System :: MacOS",
         "Operating System :: POSIX :: Linux",
         "Programming Language :: Python :: 3 :: Only",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
@@ -71,7 +70,7 @@
     packages=setuptools.find_packages(exclude=['test*']),
     install_requires=REQUIREMENTS,
     include_package_data=True,
-    python_requires=">=3.6",
+    python_requires=">=3.7",
     zip_safe=False,
     extras_require={'visualization': ['matplotlib>=2.1', 'ipywidgets>=7.3.0',
                                       "seaborn>=0.9.0", "plotly>=4.4",
diff --git a/test/ibm/test_registration.py b/test/ibm/test_registration.py
index bc3d0d90f6..ae53df02b4 100644
--- a/test/ibm/test_registration.py
+++ b/test/ibm/test_registration.py
@@ -18,7 +18,6 @@
 from unittest import skipIf
 from typing import Dict, Any
 import copy
-import sys
 
 from requests_ntlm import HttpNtlmAuth
 from qiskit_ibm_runtime import IBMRuntimeService
@@ -70,14 +69,6 @@ def test_load_account_no_credentials(self) -> None:
             "No IBM Quantum credentials found", str(context_manager.exception)
         )
 
-    # Test not supported in Python 3.6 since patching a classmethod
-    # (in mock_ibm_provider) incorrectly throws
-    # TypeError: 'NonCallableMagicMock' object is not callable
-    # which was fixed in later versions
-    @skipIf(
-        sys.version_info.major == 3 and sys.version_info.minor == 6,
-        "Test not supported on Python 3.6",
-    )
     def test_store_credentials_overwrite(self) -> None:
         """Test overwriting qiskitrc credentials."""
         credentials = Credentials("QISKITRC_TOKEN", url=QISKIT_IBM_RUNTIME_API_URL)