diff --git a/packages/react-core/src/components/CodeBlock/CodeBlockCode.tsx b/packages/react-core/src/components/CodeBlock/CodeBlockCode.tsx
index 797969c6418..274b23c6851 100644
--- a/packages/react-core/src/components/CodeBlock/CodeBlockCode.tsx
+++ b/packages/react-core/src/components/CodeBlock/CodeBlockCode.tsx
@@ -5,14 +5,20 @@ import { css } from '@patternfly/react-styles';
 export interface CodeBlockCodeProps extends React.HTMLProps<HTMLPreElement> {
   /** Code rendered inside the code block */
   children?: React.ReactNode;
+  /** Additional classes passed to the code block pre wrapper */
+  className?: string;
+  /** Additional classes passed to the code block code */
+  codeClassName?: string;
 }
 
 export const CodeBlockCode: React.FunctionComponent<CodeBlockCodeProps> = ({
   children = null,
+  className,
+  codeClassName,
   ...props
 }: CodeBlockCodeProps) => (
-  <pre className={css(styles.codeBlockPre)} {...props}>
-    <code className={css(styles.codeBlockCode)}>{children}</code>
+  <pre className={css(styles.codeBlockPre, className)} {...props}>
+    <code className={css(styles.codeBlockCode, codeClassName)}>{children}</code>
   </pre>
 );