fix for p3p
Merge branch 'p3p-fix'
remove docker